From: Jouni Malinen <jouni@qca.qualcomm.com>
Date: Thu, 1 Sep 2011 15:51:09 +0000 (+0300)
Subject: Android: Modify wireless_copy.h to fix Android build
X-Git-Tag: hostap-1-bp~247
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83180479f0700021c4ae9d8dff557346ef5251c2;p=thirdparty%2Fhostap.git

Android: Modify wireless_copy.h to fix Android build
---

diff --git a/src/drivers/wireless_copy.h b/src/drivers/wireless_copy.h
index 201719b64..d01f4cb3d 100644
--- a/src/drivers/wireless_copy.h
+++ b/src/drivers/wireless_copy.h
@@ -77,24 +77,22 @@
 /***************************** INCLUDES *****************************/
 
  /* 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/socket.h>		/* for "struct sockaddr" et al	*/
 #include <linux/if.h>			/* for IFNAMSIZ and co... */
-#else
+#else /* ANDROID */
 #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 */
-#endif
+#endif /* ANDROID */
 
 /***************************** VERSION *****************************/
 /*