Android: Modify wireless_copy.h to fix Android build

This commit is contained in:
Jouni Malinen 2011-09-01 18:51:09 +03:00 committed by Jouni Malinen
parent f4a0a82ca6
commit 83180479f0

View File

@ -77,24 +77,22 @@
/***************************** INCLUDES *****************************/ /***************************** INCLUDES *****************************/
/* jkm - replaced linux headers with C library headers, added typedefs */ /* jkm - replaced linux headers with C library headers, added typedefs */
#if 0 #ifdef ANDROID
#include <linux/types.h> /* for __u* and __s* typedefs */ #include <linux/types.h> /* for __u* and __s* typedefs */
#include <linux/socket.h> /* for "struct sockaddr" et al */ #include <linux/socket.h> /* for "struct sockaddr" et al */
#include <linux/if.h> /* for IFNAMSIZ and co... */ #include <linux/if.h> /* for IFNAMSIZ and co... */
#else #else /* ANDROID */
#include <sys/types.h> #include <sys/types.h>
#include <net/if.h> #include <net/if.h>
#ifndef ANDROID
typedef __uint32_t __u32; typedef __uint32_t __u32;
typedef __int32_t __s32; typedef __int32_t __s32;
typedef __uint16_t __u16; typedef __uint16_t __u16;
typedef __int16_t __s16; typedef __int16_t __s16;
typedef __uint8_t __u8; typedef __uint8_t __u8;
#endif /* ANDROID */
#ifndef __user #ifndef __user
#define __user #define __user
#endif /* __user */ #endif /* __user */
#endif #endif /* ANDROID */
/***************************** VERSION *****************************/ /***************************** VERSION *****************************/
/* /*