Skip to content

Commit 9fadcb2

Browse files
authored
Merge pull request #7307 from bandi13/fixNightlyCrossworks
Fix nightly crossworks
2 parents 8298019 + 98f8329 commit 9fadcb2

1 file changed

Lines changed: 44 additions & 42 deletions

File tree

src/wolfio.c

Lines changed: 44 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -41,52 +41,54 @@
4141
#include <wolfssl/error-ssl.h>
4242
#include <wolfssl/wolfio.h>
4343

44-
#ifndef USE_WINDOWS_API
45-
#if defined(WOLFSSL_LWIP) && !defined(WOLFSSL_APACHE_MYNEWT)
46-
#elif defined(ARDUINO)
47-
#elif defined(FREESCALE_MQX)
48-
#elif defined(FREESCALE_KSDK_MQX)
49-
#elif (defined(WOLFSSL_MDK_ARM) || defined(WOLFSSL_KEIL_TCP_NET))
50-
#elif defined(WOLFSSL_CMSIS_RTOS)
51-
#elif defined(WOLFSSL_CMSIS_RTOSv2)
52-
#elif defined(WOLFSSL_TIRTOS)
53-
#elif defined(FREERTOS_TCP)
54-
#elif defined(WOLFSSL_IAR_ARM)
55-
#elif defined(HAVE_NETX_BSD)
56-
#elif defined(WOLFSSL_VXWORKS)
57-
#elif defined(WOLFSSL_NUCLEUS_1_2)
58-
#elif defined(WOLFSSL_LINUXKM)
59-
/* the requisite linux/net.h is included in wc_port.h, with incompatible warnings masked out. */
60-
#elif defined(WOLFSSL_ATMEL)
61-
#elif defined(INTIME_RTOS)
62-
#include <netdb.h>
63-
#elif defined(WOLFSSL_PRCONNECT_PRO)
64-
#include <netdb.h>
65-
#include <sys/ioctl.h>
66-
#elif defined(WOLFSSL_SGX)
67-
#elif defined(WOLFSSL_APACHE_MYNEWT) && !defined(WOLFSSL_LWIP)
68-
#elif defined(WOLFSSL_DEOS)
69-
#elif defined(WOLFSSL_ZEPHYR)
70-
#elif defined(MICROCHIP_PIC32)
71-
#elif defined(HAVE_NETX)
72-
#elif defined(FUSION_RTOS)
73-
#elif !defined(WOLFSSL_NO_SOCK)
74-
#if defined(HAVE_RTP_SYS)
75-
#elif defined(EBSNET)
76-
#elif defined(NETOS)
77-
#elif !defined(DEVKITPRO) && !defined(WOLFSSL_PICOTCP) \
78-
&& !defined(WOLFSSL_CONTIKI) && !defined(WOLFSSL_WICED) \
79-
&& !defined(WOLFSSL_GNRC) && !defined(WOLFSSL_RIOT_OS)
44+
#if defined(USE_WOLFSSL_IO) || defined(HAVE_HTTP_CLIENT)
45+
#ifndef USE_WINDOWS_API
46+
#if defined(WOLFSSL_LWIP) && !defined(WOLFSSL_APACHE_MYNEWT)
47+
#elif defined(ARDUINO)
48+
#elif defined(FREESCALE_MQX)
49+
#elif defined(FREESCALE_KSDK_MQX)
50+
#elif (defined(WOLFSSL_MDK_ARM) || defined(WOLFSSL_KEIL_TCP_NET))
51+
#elif defined(WOLFSSL_CMSIS_RTOS)
52+
#elif defined(WOLFSSL_CMSIS_RTOSv2)
53+
#elif defined(WOLFSSL_TIRTOS)
54+
#elif defined(FREERTOS_TCP)
55+
#elif defined(WOLFSSL_IAR_ARM)
56+
#elif defined(HAVE_NETX_BSD)
57+
#elif defined(WOLFSSL_VXWORKS)
58+
#elif defined(WOLFSSL_NUCLEUS_1_2)
59+
#elif defined(WOLFSSL_LINUXKM)
60+
/* the requisite linux/net.h is included in wc_port.h, with incompatible warnings masked out. */
61+
#elif defined(WOLFSSL_ATMEL)
62+
#elif defined(INTIME_RTOS)
8063
#include <netdb.h>
81-
#ifdef __PPU
82-
#include <netex/errno.h>
83-
#else
84-
#include <sys/ioctl.h>
64+
#elif defined(WOLFSSL_PRCONNECT_PRO)
65+
#include <netdb.h>
66+
#include <sys/ioctl.h>
67+
#elif defined(WOLFSSL_SGX)
68+
#elif defined(WOLFSSL_APACHE_MYNEWT) && !defined(WOLFSSL_LWIP)
69+
#elif defined(WOLFSSL_DEOS)
70+
#elif defined(WOLFSSL_ZEPHYR)
71+
#elif defined(MICROCHIP_PIC32)
72+
#elif defined(HAVE_NETX)
73+
#elif defined(FUSION_RTOS)
74+
#elif !defined(WOLFSSL_NO_SOCK)
75+
#if defined(HAVE_RTP_SYS)
76+
#elif defined(EBSNET)
77+
#elif defined(NETOS)
78+
#elif !defined(DEVKITPRO) && !defined(WOLFSSL_PICOTCP) \
79+
&& !defined(WOLFSSL_CONTIKI) && !defined(WOLFSSL_WICED) \
80+
&& !defined(WOLFSSL_GNRC) && !defined(WOLFSSL_RIOT_OS)
81+
#include <netdb.h>
82+
#ifdef __PPU
83+
#include <netex/errno.h>
84+
#else
85+
#include <sys/ioctl.h>
86+
#endif
8587
#endif
8688
#endif
87-
#endif
8889

89-
#endif /* USE_WINDOWS_API */
90+
#endif /* USE_WINDOWS_API */
91+
#endif /* defined(USE_WOLFSSL_IO) || defined(HAVE_HTTP_CLIENT) */
9092

9193

9294
#if defined(HAVE_HTTP_CLIENT)

0 commit comments

Comments
 (0)