]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
wext: Do not include typedefs for Android build
authorJouni Malinen <jouni.malinen@atheros.com>
Fri, 25 Feb 2011 11:36:17 +0000 (13:36 +0200)
committerJouni Malinen <j@w1.fi>
Fri, 25 Feb 2011 11:36:17 +0000 (13:36 +0200)
Android build gets __u32 and friends from
bionic/libc/kernel/arch-x86/asm/types.h and having the typedefs here
causes redefinition errors.

src/drivers/wireless_copy.h

index 9d5ca3b759e329759eb757536a596e04b2d51135..201719b642c87e6bb9b7f5e8b7adc5174edf0cd1 100644 (file)
 #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 */