From 8fcb0073010b561b667055c2919d146b3f4191b2 Mon Sep 17 00:00:00 2001 From: Andras Fekete Date: Fri, 8 Mar 2024 11:46:49 -0500 Subject: [PATCH 1/2] Missing gating for netdb.h includes --- src/wolfio.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/wolfio.c b/src/wolfio.c index 8dd185735..d4ed9153b 100644 --- a/src/wolfio.c +++ b/src/wolfio.c @@ -41,6 +41,7 @@ #include #include +#if defined(USE_WOLFSSL_IO) || defined(HAVE_HTTP_CLIENT) #ifndef USE_WINDOWS_API #if defined(WOLFSSL_LWIP) && !defined(WOLFSSL_APACHE_MYNEWT) #elif defined(ARDUINO) @@ -87,6 +88,7 @@ #endif #endif /* USE_WINDOWS_API */ +#endif /* defined(USE_WOLFSSL_IO) || defined(HAVE_HTTP_CLIENT) */ #if defined(HAVE_HTTP_CLIENT) From 98f8329bf2b163ee77312db5305ac74517014a9a Mon Sep 17 00:00:00 2001 From: Andras Fekete Date: Fri, 8 Mar 2024 11:49:38 -0500 Subject: [PATCH 2/2] Add indentation for legibility --- src/wolfio.c | 84 ++++++++++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/src/wolfio.c b/src/wolfio.c index d4ed9153b..041e0b77d 100644 --- a/src/wolfio.c +++ b/src/wolfio.c @@ -42,52 +42,52 @@ #include #if defined(USE_WOLFSSL_IO) || defined(HAVE_HTTP_CLIENT) -#ifndef USE_WINDOWS_API - #if defined(WOLFSSL_LWIP) && !defined(WOLFSSL_APACHE_MYNEWT) - #elif defined(ARDUINO) - #elif defined(FREESCALE_MQX) - #elif defined(FREESCALE_KSDK_MQX) - #elif (defined(WOLFSSL_MDK_ARM) || defined(WOLFSSL_KEIL_TCP_NET)) - #elif defined(WOLFSSL_CMSIS_RTOS) - #elif defined(WOLFSSL_CMSIS_RTOSv2) - #elif defined(WOLFSSL_TIRTOS) - #elif defined(FREERTOS_TCP) - #elif defined(WOLFSSL_IAR_ARM) - #elif defined(HAVE_NETX_BSD) - #elif defined(WOLFSSL_VXWORKS) - #elif defined(WOLFSSL_NUCLEUS_1_2) - #elif defined(WOLFSSL_LINUXKM) - /* the requisite linux/net.h is included in wc_port.h, with incompatible warnings masked out. */ - #elif defined(WOLFSSL_ATMEL) - #elif defined(INTIME_RTOS) - #include - #elif defined(WOLFSSL_PRCONNECT_PRO) - #include - #include - #elif defined(WOLFSSL_SGX) - #elif defined(WOLFSSL_APACHE_MYNEWT) && !defined(WOLFSSL_LWIP) - #elif defined(WOLFSSL_DEOS) - #elif defined(WOLFSSL_ZEPHYR) - #elif defined(MICROCHIP_PIC32) - #elif defined(HAVE_NETX) - #elif defined(FUSION_RTOS) - #elif !defined(WOLFSSL_NO_SOCK) - #if defined(HAVE_RTP_SYS) - #elif defined(EBSNET) - #elif defined(NETOS) - #elif !defined(DEVKITPRO) && !defined(WOLFSSL_PICOTCP) \ - && !defined(WOLFSSL_CONTIKI) && !defined(WOLFSSL_WICED) \ - && !defined(WOLFSSL_GNRC) && !defined(WOLFSSL_RIOT_OS) + #ifndef USE_WINDOWS_API + #if defined(WOLFSSL_LWIP) && !defined(WOLFSSL_APACHE_MYNEWT) + #elif defined(ARDUINO) + #elif defined(FREESCALE_MQX) + #elif defined(FREESCALE_KSDK_MQX) + #elif (defined(WOLFSSL_MDK_ARM) || defined(WOLFSSL_KEIL_TCP_NET)) + #elif defined(WOLFSSL_CMSIS_RTOS) + #elif defined(WOLFSSL_CMSIS_RTOSv2) + #elif defined(WOLFSSL_TIRTOS) + #elif defined(FREERTOS_TCP) + #elif defined(WOLFSSL_IAR_ARM) + #elif defined(HAVE_NETX_BSD) + #elif defined(WOLFSSL_VXWORKS) + #elif defined(WOLFSSL_NUCLEUS_1_2) + #elif defined(WOLFSSL_LINUXKM) + /* the requisite linux/net.h is included in wc_port.h, with incompatible warnings masked out. */ + #elif defined(WOLFSSL_ATMEL) + #elif defined(INTIME_RTOS) #include - #ifdef __PPU - #include - #else - #include + #elif defined(WOLFSSL_PRCONNECT_PRO) + #include + #include + #elif defined(WOLFSSL_SGX) + #elif defined(WOLFSSL_APACHE_MYNEWT) && !defined(WOLFSSL_LWIP) + #elif defined(WOLFSSL_DEOS) + #elif defined(WOLFSSL_ZEPHYR) + #elif defined(MICROCHIP_PIC32) + #elif defined(HAVE_NETX) + #elif defined(FUSION_RTOS) + #elif !defined(WOLFSSL_NO_SOCK) + #if defined(HAVE_RTP_SYS) + #elif defined(EBSNET) + #elif defined(NETOS) + #elif !defined(DEVKITPRO) && !defined(WOLFSSL_PICOTCP) \ + && !defined(WOLFSSL_CONTIKI) && !defined(WOLFSSL_WICED) \ + && !defined(WOLFSSL_GNRC) && !defined(WOLFSSL_RIOT_OS) + #include + #ifdef __PPU + #include + #else + #include + #endif #endif #endif - #endif -#endif /* USE_WINDOWS_API */ + #endif /* USE_WINDOWS_API */ #endif /* defined(USE_WOLFSSL_IO) || defined(HAVE_HTTP_CLIENT) */