From c4633c32c14ea1de8251cdb94da40b1f654fcde2 Mon Sep 17 00:00:00 2001 From: "Evgeny Grin (Karlson2k)" Date: Thu, 18 May 2023 19:56:42 +0300 Subject: [PATCH] Added specific headers inclusion and detection This is a workaround for headers mess on Solaris --- configure.ac | 10 ++++++++-- src/microhttpd/test_client_put_stop.c | 3 +++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index eefeee50..f23a10e8 100644 --- a/configure.ac +++ b/configure.ac @@ -496,8 +496,8 @@ AC_CHECK_HEADERS([endian.h machine/endian.h sys/endian.h sys/byteorder.h \ sys/ioctl.h], [], [], [AC_INCLUDES_DEFAULT]) # Check for network and sockets optional headers -AC_CHECK_HEADERS([sys/socket.h sys/select.h netinet/in.h arpa/inet.h \ - netinet/ip.h netinet/tcp.h net/if.h \ +AC_CHECK_HEADERS([sys/socket.h sys/select.h netinet/in_systm.h netinet/in.h \ + arpa/inet.h netinet/ip.h netinet/tcp.h net/if.h \ netdb.h sockLib.h inetLib.h], [], [], [AC_INCLUDES_DEFAULT [ @@ -510,6 +510,9 @@ AC_CHECK_HEADERS([sys/socket.h sys/select.h netinet/in.h arpa/inet.h \ #ifdef HAVE_SYS_SOCKET_H #include #endif /* HAVE_SYS_SOCKET_H */ +#ifdef HAVE_NETINET_IN_SYSTM_H +#include +#endif /* HAVE_NETINET_IN_SYSTM_H */ #ifdef HAVE_NETINET_IN_H #include #endif /* HAVE_NETINET_IN_H */ @@ -658,6 +661,9 @@ AC_CHECK_HEADERS([sys/sysctl.h netinet/ip_icmp.h netinet/icmp_var.h], [], [], #ifdef HAVE_SYS_SOCKET_H #include #endif /* HAVE_SYS_SOCKET_H */ +#ifdef HAVE_NETINET_IN_SYSTM_H +#include +#endif /* HAVE_NETINET_IN_SYSTM_H */ #ifdef HAVE_NETINET_IN_H #include #endif /* HAVE_NETINET_IN_H */ diff --git a/src/microhttpd/test_client_put_stop.c b/src/microhttpd/test_client_put_stop.c index 16a09d65..b25cf667 100644 --- a/src/microhttpd/test_client_put_stop.c +++ b/src/microhttpd/test_client_put_stop.c @@ -65,6 +65,9 @@ #ifdef HAVE_SYS_SOCKET_H #include #endif /* HAVE_SYS_SOCKET_H */ +#ifdef HAVE_NETINET_IN_SYSTM_H +#include +#endif /* HAVE_NETINET_IN_SYSTM_H */ #ifdef HAVE_NETINET_IN_H #include #endif /* HAVE_NETINET_IN_H */