From 720f9b3a0b027c7876748905273978dd159feedf Mon Sep 17 00:00:00 2001 From: goldsimon Date: Wed, 29 Mar 2017 23:02:16 +0200 Subject: [PATCH] fix compiling altcp_tls_mbedtls sources/headers if mbedtls is not available --- src/apps/altcp_tls/altcp_tls_mbedtls_mem.c | 6 ++++++ src/apps/altcp_tls/altcp_tls_mbedtls_mem.h | 6 +++++- src/apps/altcp_tls/altcp_tls_mbedtls_structs.h | 6 +++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/apps/altcp_tls/altcp_tls_mbedtls_mem.c b/src/apps/altcp_tls/altcp_tls_mbedtls_mem.c index eccb4856..7db7f489 100644 --- a/src/apps/altcp_tls/altcp_tls_mbedtls_mem.c +++ b/src/apps/altcp_tls/altcp_tls_mbedtls_mem.c @@ -52,6 +52,10 @@ #if LWIP_ALTCP /* don't build if not configured for use in lwipopts.h */ +#include "lwip/apps/altcp_tls_mbedtls_opts.h" + +#if LWIP_ALTCP_TLS && LWIP_ALTCP_TLS_MBEDTLS + #include "altcp_tls_mbedtls_mem.h" #include "altcp_tls_mbedtls_structs.h" #include "lwip/mem.h" @@ -207,4 +211,6 @@ altcp_mbedtls_free_config(void *item) LWIP_ASSERT("item != NULL", item != NULL); mem_free(item); } + +#endif /* LWIP_ALTCP_TLS && LWIP_ALTCP_TLS_MBEDTLS */ #endif /* LWIP_ALTCP */ diff --git a/src/apps/altcp_tls/altcp_tls_mbedtls_mem.h b/src/apps/altcp_tls/altcp_tls_mbedtls_mem.h index a5610ba8..9ccde64a 100644 --- a/src/apps/altcp_tls/altcp_tls_mbedtls_mem.h +++ b/src/apps/altcp_tls/altcp_tls_mbedtls_mem.h @@ -47,6 +47,10 @@ #if LWIP_ALTCP /* don't build if not configured for use in lwipopts.h */ +#include "lwip/apps/altcp_tls_mbedtls_opts.h" + +#if LWIP_ALTCP_TLS && LWIP_ALTCP_TLS_MBEDTLS + #include "altcp_tls_mbedtls_structs.h" #ifdef __cplusplus @@ -63,6 +67,6 @@ void altcp_mbedtls_free_config(void *item); } #endif +#endif /* LWIP_ALTCP_TLS && LWIP_ALTCP_TLS_MBEDTLS */ #endif /* LWIP_ALTCP */ - #endif /* LWIP_HDR_ALTCP_TLS_H */ diff --git a/src/apps/altcp_tls/altcp_tls_mbedtls_structs.h b/src/apps/altcp_tls/altcp_tls_mbedtls_structs.h index 732fabd6..f215fc63 100644 --- a/src/apps/altcp_tls/altcp_tls_mbedtls_structs.h +++ b/src/apps/altcp_tls/altcp_tls_mbedtls_structs.h @@ -43,6 +43,10 @@ #if LWIP_ALTCP /* don't build if not configured for use in lwipopts.h */ +#include "lwip/apps/altcp_tls_mbedtls_opts.h" + +#if LWIP_ALTCP_TLS && LWIP_ALTCP_TLS_MBEDTLS + #include "lwip/altcp.h" #include "lwip/pbuf.h" @@ -76,6 +80,6 @@ typedef struct altcp_mbedtls_state_s { } #endif +#endif /* LWIP_ALTCP_TLS && LWIP_ALTCP_TLS_MBEDTLS */ #endif /* LWIP_ALTCP */ - #endif /* LWIP_HDR_ALTCP_MBEDTLS_STRUCTS_H */