[oe-commits] Khem Raj : wpa-supplicant: Replace non-standard base defines with c99 compliant ones

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 7a3bc227b347cf170b6e7f4d9568aa3d685a45d2
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=7a3bc227b347cf170b6e7f4d9568aa3d685a45d2

Author: Khem Raj <raj.khem at gmail.com>
Date:   Mon Apr  6 17:36:50 2015 +0000

wpa-supplicant: Replace non-standard base defines with c99 compliant ones

Makes it more portable

Change-Id: I033787934cd91243ce8f8ce3a974a157aa5cfd6a
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../wpa-supplicant/wpa-supplicant.inc              |  1 +
 .../0001-linux_wext-Fix-types-for-musl.patch       | 38 ++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc
index f95e91c..dae0606 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc
@@ -25,6 +25,7 @@ SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
            file://wpa_supplicant.conf-sane \
            file://99_wpa_supplicant \
            file://fix-libnl3-host-contamination.patch \
+           file://0001-linux_wext-Fix-types-for-musl.patch \
           "
 SRC_URI[md5sum] = "f2ed8fef72cf63d8d446a2d0a6da630a"
 SRC_URI[sha256sum] = "eaaa5bf3055270e521b2dff64f2d203ec8040f71958b8588269a82c00c9d7b6a"
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-linux_wext-Fix-types-for-musl.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-linux_wext-Fix-types-for-musl.patch
new file mode 100644
index 0000000..49a988b
--- /dev/null
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-linux_wext-Fix-types-for-musl.patch
@@ -0,0 +1,38 @@
+From 159db445dc4cb0af5f6ad85f3a146ad137db5057 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem at gmail.com>
+Date: Fri, 3 Apr 2015 20:38:21 -0700
+Subject: [PATCH] linux_wext: Fix types for musl
+
+| ../src/drivers/linux_wext.h:24:9: error: unknown type name '__uint32_t'
+|  typedef __uint32_t __u32;
+
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+Upstream-Status: Pending
+---
+ src/drivers/linux_wext.h | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/drivers/linux_wext.h b/src/drivers/linux_wext.h
+index 55cf955..e66df91 100644
+--- a/src/drivers/linux_wext.h
++++ b/src/drivers/linux_wext.h
+@@ -21,11 +21,11 @@
+ 
+ #include <sys/types.h>
+ #include <net/if.h>
+-typedef __uint32_t __u32;
+-typedef __int32_t __s32;
+-typedef __uint16_t __u16;
+-typedef __int16_t __s16;
+-typedef __uint8_t __u8;
++typedef u_int32_t __u32;
++typedef int32_t __s32;
++typedef u_int16_t __u16;
++typedef int16_t __s16;
++typedef u_int8_t __u8;
+ #ifndef __user
+ #define __user
+ #endif /* __user */
+-- 
+2.1.4
+