From ef8689b0b8d981f8a06f0cb4ddded2dfd9b59bf9 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Wed, 6 Feb 2019 22:29:26 -0800 Subject: [PATCH] Updated submodules and patches --- ext/lwip | 2 +- ext/lwip-contrib | 2 +- ext/lwip-contrib.patch | 27 +++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 ext/lwip-contrib.patch diff --git a/ext/lwip b/ext/lwip index 159e31b..92f23d6 160000 --- a/ext/lwip +++ b/ext/lwip @@ -1 +1 @@ -Subproject commit 159e31b689577dbf69cf0683bbaffbd71fa5ee10 +Subproject commit 92f23d6ca0971a32f2085b9480e738d34174417b diff --git a/ext/lwip-contrib b/ext/lwip-contrib index 35b011d..4d18380 160000 --- a/ext/lwip-contrib +++ b/ext/lwip-contrib @@ -1 +1 @@ -Subproject commit 35b011d4cf4c4b480f8859c456587a884ec9d287 +Subproject commit 4d1838043ec8d31ff308fa10326ea8e3a61063cd diff --git a/ext/lwip-contrib.patch b/ext/lwip-contrib.patch new file mode 100644 index 0000000..908a24c --- /dev/null +++ b/ext/lwip-contrib.patch @@ -0,0 +1,27 @@ +diff --git a/ports/unix/port/include/arch/cc.h b/ports/unix/port/include/arch/cc.h +index a3dac04..5e6f4db 100644 +--- a/ports/unix/port/include/arch/cc.h ++++ b/ports/unix/port/include/arch/cc.h +@@ -32,6 +32,8 @@ + #ifndef LWIP_ARCH_CC_H + #define LWIP_ARCH_CC_H + ++#include "Debug.hpp" // libzt ++ + /* see https://sourceforge.net/p/predef/wiki/OperatingSystems/ */ + #if defined __ANDROID__ + #define LWIP_UNIX_ANDROID +@@ -55,9 +57,12 @@ + #endif + + #if defined(LWIP_UNIX_ANDROID) && defined(FD_SET) +-typedef __kernel_fd_set fd_set; ++//typedef __kernel_fd_set fd_set; + #endif + ++// Comment out the following line to use lwIP's default diagnostic printing routine ++#define LWIP_PLATFORM_DIAG(x) do {DEBUG_INFO x;} while(0) ++ + struct sio_status_s; + typedef struct sio_status_s sio_status_t; + #define sio_fd_t sio_status_t*