From 182d7c138a5b845c74b7d364ee07af6105d8e786 Mon Sep 17 00:00:00 2001 From: Dirk Ziegelmeier Date: Wed, 30 Nov 2016 07:43:59 +0100 Subject: [PATCH] Add #include to a central place (arch.h) instead of #including it in several other files throughout lwip since size_t is needed in many places See http://lwip.100.n7.nabble.com/Issue-in-arch-h-for-lwIP-2-0-0-td27948.html --- src/core/inet_chksum.c | 1 - src/include/lwip/api.h | 3 +-- src/include/lwip/arch.h | 2 ++ src/include/lwip/mem.h | 3 ++- src/include/lwip/netdb.h | 3 +-- src/include/lwip/priv/api_msg.h | 3 +-- src/include/lwip/sockets.h | 2 -- 7 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/core/inet_chksum.c b/src/core/inet_chksum.c index 80289528..917f3e4f 100644 --- a/src/core/inet_chksum.c +++ b/src/core/inet_chksum.c @@ -51,7 +51,6 @@ #include "lwip/def.h" #include "lwip/ip_addr.h" -#include #include #ifndef LWIP_CHKSUM diff --git a/src/include/lwip/api.h b/src/include/lwip/api.h index d1394533..516bd163 100644 --- a/src/include/lwip/api.h +++ b/src/include/lwip/api.h @@ -43,8 +43,7 @@ /* Note: Netconn API is always available when sockets are enabled - * sockets are implemented on top of them */ -#include /* for size_t */ - +#include "lwip/arch.h" #include "lwip/netbuf.h" #include "lwip/sys.h" #include "lwip/ip_addr.h" diff --git a/src/include/lwip/arch.h b/src/include/lwip/arch.h index 473e4a4a..27923948 100644 --- a/src/include/lwip/arch.h +++ b/src/include/lwip/arch.h @@ -47,6 +47,8 @@ #include "arch/cc.h" +#include /* for size_t */ + /** Define this to 1 in arch/cc.h of your port if your compiler does not provide * the stdint.h header. This cannot be \#defined in lwipopts.h since * this is not an option of lwIP itself, but an option of the lwIP port diff --git a/src/include/lwip/mem.h b/src/include/lwip/mem.h index e4f6a64d..ff208d25 100644 --- a/src/include/lwip/mem.h +++ b/src/include/lwip/mem.h @@ -45,7 +45,8 @@ extern "C" { #if MEM_LIBC_MALLOC -#include /* for size_t */ +#include "lwip/arch.h" + typedef size_t mem_size_t; #define MEM_SIZE_F SZT_F diff --git a/src/include/lwip/netdb.h b/src/include/lwip/netdb.h index 21688c65..d3d15dfa 100644 --- a/src/include/lwip/netdb.h +++ b/src/include/lwip/netdb.h @@ -38,8 +38,7 @@ #if LWIP_DNS && LWIP_SOCKET -#include /* for size_t */ - +#include "lwip/arch.h" #include "lwip/inet.h" #include "lwip/sockets.h" diff --git a/src/include/lwip/priv/api_msg.h b/src/include/lwip/priv/api_msg.h index ad383456..f12b8b7d 100644 --- a/src/include/lwip/priv/api_msg.h +++ b/src/include/lwip/priv/api_msg.h @@ -43,8 +43,7 @@ /* Note: Netconn API is always available when sockets are enabled - * sockets are implemented on top of them */ -#include /* for size_t */ - +#include "lwip/arch.h" #include "lwip/ip_addr.h" #include "lwip/err.h" #include "lwip/sys.h" diff --git a/src/include/lwip/sockets.h b/src/include/lwip/sockets.h index 9d76776f..2522056d 100644 --- a/src/include/lwip/sockets.h +++ b/src/include/lwip/sockets.h @@ -43,8 +43,6 @@ #if LWIP_SOCKET /* don't build if not configured for use in lwipopts.h */ -#include /* for size_t */ - #include "lwip/ip_addr.h" #include "lwip/err.h" #include "lwip/inet.h"