From: Jouni Malinen <jouni.malinen@atheros.com>
Date: Fri, 25 Feb 2011 11:36:17 +0000 (+0200)
Subject: wext: Do not include typedefs for Android build
X-Git-Tag: hostap-1-bp~551
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4d4aebe69ac10d610d724210ccfcd2104a17af8;p=thirdparty%2Fhostap.git

wext: Do not include typedefs for Android build

Android build gets __u32 and friends from
bionic/libc/kernel/arch-x86/asm/types.h and having the typedefs here
causes redefinition errors.
---

diff --git a/src/drivers/wireless_copy.h b/src/drivers/wireless_copy.h
index 9d5ca3b75..201719b64 100644
--- a/src/drivers/wireless_copy.h
+++ b/src/drivers/wireless_copy.h
@@ -84,11 +84,13 @@
 #else
 #include <sys/types.h>
 #include <net/if.h>
+#ifndef ANDROID
 typedef __uint32_t __u32;
 typedef __int32_t __s32;
 typedef __uint16_t __u16;
 typedef __int16_t __s16;
 typedef __uint8_t __u8;
+#endif /* ANDROID */
 #ifndef __user
 #define __user
 #endif /* __user */