ndk fixes

* always set SOCKLEN_T_DEFINED * don't use fd_set weirdness
quiet · Jan 22, 2018 · b8904ea · b8904ea
1 parent 8423e5a
commit b8904ea
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 20 deletions.
diff --git a/quiet/src/main/jni/include/arm64-v8a/quiet-lwip/lwip/arch/cc.h b/quiet/src/main/jni/include/arm64-v8a/quiet-lwip/lwip/arch/cc.h
@@ -45,7 +45,6 @@
 #define LWIP_UNIX_ANDROID
 /* the next include defines __ANDROID_API__ */
 #include <android/api-level.h>
-#if __ANDROID_API__ >= 21
 #define SOCKLEN_T_DEFINED
 #endif
 #endif
@@ -110,10 +109,6 @@ typedef uintptr_t  mem_ptr_t;
 
 #define LWIP_RAND() ((u32_t)rand())
 
-#if defined(LWIP_UNIX_ANDROID) && defined(FD_SET)
-    typedef __kernel_fd_set fd_set;
-#endif
-
 struct sio_status_s;
 typedef struct sio_status_s sio_status_t;
 #define sio_fd_t sio_status_t*

diff --git a/quiet/src/main/jni/include/armeabi-v7a/quiet-lwip/lwip/arch/cc.h b/quiet/src/main/jni/include/armeabi-v7a/quiet-lwip/lwip/arch/cc.h
@@ -45,7 +45,6 @@
 #define LWIP_UNIX_ANDROID
 /* the next include defines __ANDROID_API__ */
 #include <android/api-level.h>
-#if __ANDROID_API__ >= 21
 #define SOCKLEN_T_DEFINED
 #endif
 #endif
@@ -110,10 +109,6 @@ typedef uintptr_t  mem_ptr_t;
 
 #define LWIP_RAND() ((u32_t)rand())
 
-#if defined(LWIP_UNIX_ANDROID) && defined(FD_SET)
-    typedef __kernel_fd_set fd_set;
-#endif
-
 struct sio_status_s;
 typedef struct sio_status_s sio_status_t;
 #define sio_fd_t sio_status_t*

diff --git a/quiet/src/main/jni/include/x86/quiet-lwip/lwip/arch/cc.h b/quiet/src/main/jni/include/x86/quiet-lwip/lwip/arch/cc.h
@@ -45,7 +45,6 @@
 #define LWIP_UNIX_ANDROID
 /* the next include defines __ANDROID_API__ */
 #include <android/api-level.h>
-#if __ANDROID_API__ >= 21
 #define SOCKLEN_T_DEFINED
 #endif
 #endif
@@ -110,10 +109,6 @@ typedef uintptr_t  mem_ptr_t;
 
 #define LWIP_RAND() ((u32_t)rand())
 
-#if defined(LWIP_UNIX_ANDROID) && defined(FD_SET)
-    typedef __kernel_fd_set fd_set;
-#endif
-
 struct sio_status_s;
 typedef struct sio_status_s sio_status_t;
 #define sio_fd_t sio_status_t*

diff --git a/quiet/src/main/jni/include/x86_64/quiet-lwip/lwip/arch/cc.h b/quiet/src/main/jni/include/x86_64/quiet-lwip/lwip/arch/cc.h
@@ -45,7 +45,6 @@
 #define LWIP_UNIX_ANDROID
 /* the next include defines __ANDROID_API__ */
 #include <android/api-level.h>
-#if __ANDROID_API__ >= 21
 #define SOCKLEN_T_DEFINED
 #endif
 #endif
@@ -110,10 +109,6 @@ typedef uintptr_t  mem_ptr_t;
 
 #define LWIP_RAND() ((u32_t)rand())
 
-#if defined(LWIP_UNIX_ANDROID) && defined(FD_SET)
-    typedef __kernel_fd_set fd_set;
-#endif
-
 struct sio_status_s;
 typedef struct sio_status_s sio_status_t;
 #define sio_fd_t sio_status_t*