Declare mem_* functions only for lwip internal use

Openssl has its own mem_* functions declarations, which differ from the lwip
ones. Therefore we enable the lwip declarations only for lwip code.

Signed-off-by: Costin Lupu <costin.lupu@cs.pub.ro>
Reviewed-by: Felipe Huici <felipe.huici@neclab.eu>

diff --git a/Makefile.uk b/Makefile.uk
index 675d52e721097993a470897e7292cbb20d465ae7..c2651d7a49bb9d2abf32329d6c32e18f690901d5 100644 (file)
--- a/Makefile.uk
+++ b/Makefile.uk
@@ -65,7 +65,9 @@ CXXINCLUDES-$(CONFIG_LIBLWIP) += -I$(LIBLWIP_BASE)/include -I$(LIBLWIP_EXTRACTED
 ################################################################################
 LIBLWIP_CFLAGS-y += -Wno-type-limits -Wunused-parameter
 LIBLWIP_CFLAGS-$(CONFIG_LWIP_DEBUG) += -DUK_DEBUG
-
+LIBLWIP_CFLAGS-y   += -D__IN_LIBLWIP__
+LIBLWIP_CXXFLAGS-y += -D__IN_LIBLWIP__
+       
 ################################################################################
 # Core
 ################################################################################

diff --git a/patches/0003-Declare-mem_-functions-only-for-lwip-internal-use.patch b/patches/0003-Declare-mem_-functions-only-for-lwip-internal-use.patch
new file mode 100644 (file)
index 0000000..c43106a
--- /dev/null
+++ b/patches/0003-Declare-mem_-functions-only-for-lwip-internal-use.patch
@@ -0,0 +1,16 @@
+--- a/src/include/lwip/mem.h
++++ b/src/include/lwip/mem.h
+@@ -69,11 +69,13 @@
+ #endif /* MEM_SIZE > 64000 */\r
+ #endif\r
+ \r
++#ifdef __IN_LIBLWIP__\r
+ void  mem_init(void);\r
+ void *mem_trim(void *mem, mem_size_t size);\r
+ void *mem_malloc(mem_size_t size);\r
+ void *mem_calloc(mem_size_t count, mem_size_t size);\r
+ void  mem_free(void *mem);\r
++#endif\r
+ \r
+ #ifdef __cplusplus\r
+ }\r