summaryrefslogtreecommitdiff
path: root/comms
diff options
context:
space:
mode:
authorKris Kennaway <kris@FreeBSD.org>2002-09-29 06:45:34 +0000
committerKris Kennaway <kris@FreeBSD.org>2002-09-29 06:45:34 +0000
commit32c9e244e090d08514aa3e2da80532b1bf0213b6 (patch)
tree95660bd1301c0558efc4230653d78d91ab13b6bb /comms
parentRemove -Werror from CFLAGS to fix build (diff)
Fix build on -current (don't shadow typedef ushort)
Notes
Notes: svn path=/head/; revision=67229
Diffstat (limited to 'comms')
-rw-r--r--comms/mlan/files/patch-ad11
-rw-r--r--comms/mlan/files/patch-ae10
-rw-r--r--comms/mlan/files/patch-af10
3 files changed, 31 insertions, 0 deletions
diff --git a/comms/mlan/files/patch-ad b/comms/mlan/files/patch-ad
new file mode 100644
index 000000000000..037bc10d5326
--- /dev/null
+++ b/comms/mlan/files/patch-ad
@@ -0,0 +1,11 @@
+--- ./source/apps/thermo/thermo.h.orig Sat Sep 28 23:52:11 2002
++++ ./source/apps/thermo/thermo.h Sat Sep 28 23:52:21 2002
+@@ -18,6 +18,8 @@
+ //
+ // Version: 1.03
+ //
++
++#include <sys/types.h>
+
+
+ #ifndef THERMO_TYPES
diff --git a/comms/mlan/files/patch-ae b/comms/mlan/files/patch-ae
new file mode 100644
index 000000000000..4bd6aac19de3
--- /dev/null
+++ b/comms/mlan/files/patch-ae
@@ -0,0 +1,10 @@
+--- ./source/lib/general/mlan.h.orig Sat Sep 28 23:53:45 2002
++++ ./source/lib/general/mlan.h Sat Sep 28 23:53:54 2002
+@@ -34,7 +34,6 @@
+ #ifndef MLAN_UCHAR
+ #define MLAN_UCHAR
+ typedef unsigned char uchar;
+- typedef unsigned short ushort;
+ typedef unsigned long ulong;
+ #endif
+
diff --git a/comms/mlan/files/patch-af b/comms/mlan/files/patch-af
new file mode 100644
index 000000000000..17296c3b2522
--- /dev/null
+++ b/comms/mlan/files/patch-af
@@ -0,0 +1,10 @@
+--- ./source/lib/userial/mlan.h.orig Sat Sep 28 23:54:17 2002
++++ ./source/lib/userial/mlan.h Sat Sep 28 23:53:58 2002
+@@ -34,7 +34,6 @@
+ #ifndef MLAN_UCHAR
+ #define MLAN_UCHAR
+ typedef unsigned char uchar;
+- typedef unsigned short ushort;
+ typedef unsigned long ulong;
+ #endif
+