WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit b8904ea

Browse files
brian-armstrongbrian-armstrong
committed
ndk fixes
* always set SOCKLEN_T_DEFINED * don't use fd_set weirdness
1 parent 8423e5a commit b8904ea

File tree

4 files changed

+0
-20
lines changed
  • quiet/src/main/jni/include
    • arm64-v8a/quiet-lwip/lwip/arch
    • armeabi-v7a/quiet-lwip/lwip/arch
    • x86_64/quiet-lwip/lwip/arch
    • x86/quiet-lwip/lwip/arch

4 files changed

+0
-20
lines changed

‎quiet/src/main/jni/include/arm64-v8a/quiet-lwip/lwip/arch/cc.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
#define LWIP_UNIX_ANDROID
4646
/* the next include defines __ANDROID_API__ */
4747
#include <android/api-level.h>
48-
#if __ANDROID_API__ >= 21
4948
#define SOCKLEN_T_DEFINED
5049
#endif
5150
#endif
@@ -110,10 +109,6 @@ typedef uintptr_t mem_ptr_t;
110109

111110
#define LWIP_RAND() ((u32_t)rand())
112111

113-
#if defined(LWIP_UNIX_ANDROID) && defined(FD_SET)
114-
typedef __kernel_fd_set fd_set;
115-
#endif
116-
117112
struct sio_status_s;
118113
typedef struct sio_status_s sio_status_t;
119114
#define sio_fd_t sio_status_t*

‎quiet/src/main/jni/include/armeabi-v7a/quiet-lwip/lwip/arch/cc.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
#define LWIP_UNIX_ANDROID
4646
/* the next include defines __ANDROID_API__ */
4747
#include <android/api-level.h>
48-
#if __ANDROID_API__ >= 21
4948
#define SOCKLEN_T_DEFINED
5049
#endif
5150
#endif
@@ -110,10 +109,6 @@ typedef uintptr_t mem_ptr_t;
110109

111110
#define LWIP_RAND() ((u32_t)rand())
112111

113-
#if defined(LWIP_UNIX_ANDROID) && defined(FD_SET)
114-
typedef __kernel_fd_set fd_set;
115-
#endif
116-
117112
struct sio_status_s;
118113
typedef struct sio_status_s sio_status_t;
119114
#define sio_fd_t sio_status_t*

‎quiet/src/main/jni/include/x86/quiet-lwip/lwip/arch/cc.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
#define LWIP_UNIX_ANDROID
4646
/* the next include defines __ANDROID_API__ */
4747
#include <android/api-level.h>
48-
#if __ANDROID_API__ >= 21
4948
#define SOCKLEN_T_DEFINED
5049
#endif
5150
#endif
@@ -110,10 +109,6 @@ typedef uintptr_t mem_ptr_t;
110109

111110
#define LWIP_RAND() ((u32_t)rand())
112111

113-
#if defined(LWIP_UNIX_ANDROID) && defined(FD_SET)
114-
typedef __kernel_fd_set fd_set;
115-
#endif
116-
117112
struct sio_status_s;
118113
typedef struct sio_status_s sio_status_t;
119114
#define sio_fd_t sio_status_t*

‎quiet/src/main/jni/include/x86_64/quiet-lwip/lwip/arch/cc.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
#define LWIP_UNIX_ANDROID
4646
/* the next include defines __ANDROID_API__ */
4747
#include <android/api-level.h>
48-
#if __ANDROID_API__ >= 21
4948
#define SOCKLEN_T_DEFINED
5049
#endif
5150
#endif
@@ -110,10 +109,6 @@ typedef uintptr_t mem_ptr_t;
110109

111110
#define LWIP_RAND() ((u32_t)rand())
112111

113-
#if defined(LWIP_UNIX_ANDROID) && defined(FD_SET)
114-
typedef __kernel_fd_set fd_set;
115-
#endif
116-
117112
struct sio_status_s;
118113
typedef struct sio_status_s sio_status_t;
119114
#define sio_fd_t sio_status_t*

0 commit comments

Comments
 (0)