diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2023-05-18 19:56:42 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2023-06-01 09:43:01 +0300 |
commit | c4633c32c14ea1de8251cdb94da40b1f654fcde2 (patch) | |
tree | ce3895b10324c994ce3845b7d036badbbfc569c0 | |
parent | 70c1dbb15bba2a92a92181ed5917b334d29a60c5 (diff) | |
download | libmicrohttpd-c4633c32c14ea1de8251cdb94da40b1f654fcde2.tar.gz libmicrohttpd-c4633c32c14ea1de8251cdb94da40b1f654fcde2.zip |
Added specific headers inclusion and detection
This is a workaround for headers mess on Solaris
-rw-r--r-- | configure.ac | 10 | ||||
-rw-r--r-- | 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 \ | |||
496 | sys/ioctl.h], [], [], [AC_INCLUDES_DEFAULT]) | 496 | sys/ioctl.h], [], [], [AC_INCLUDES_DEFAULT]) |
497 | 497 | ||
498 | # Check for network and sockets optional headers | 498 | # Check for network and sockets optional headers |
499 | AC_CHECK_HEADERS([sys/socket.h sys/select.h netinet/in.h arpa/inet.h \ | 499 | AC_CHECK_HEADERS([sys/socket.h sys/select.h netinet/in_systm.h netinet/in.h \ |
500 | netinet/ip.h netinet/tcp.h net/if.h \ | 500 | arpa/inet.h netinet/ip.h netinet/tcp.h net/if.h \ |
501 | netdb.h sockLib.h inetLib.h], [], [], | 501 | netdb.h sockLib.h inetLib.h], [], [], |
502 | [AC_INCLUDES_DEFAULT | 502 | [AC_INCLUDES_DEFAULT |
503 | [ | 503 | [ |
@@ -510,6 +510,9 @@ AC_CHECK_HEADERS([sys/socket.h sys/select.h netinet/in.h arpa/inet.h \ | |||
510 | #ifdef HAVE_SYS_SOCKET_H | 510 | #ifdef HAVE_SYS_SOCKET_H |
511 | #include <sys/socket.h> | 511 | #include <sys/socket.h> |
512 | #endif /* HAVE_SYS_SOCKET_H */ | 512 | #endif /* HAVE_SYS_SOCKET_H */ |
513 | #ifdef HAVE_NETINET_IN_SYSTM_H | ||
514 | #include <netinet/in_systm.h> | ||
515 | #endif /* HAVE_NETINET_IN_SYSTM_H */ | ||
513 | #ifdef HAVE_NETINET_IN_H | 516 | #ifdef HAVE_NETINET_IN_H |
514 | #include <netinet/in.h> | 517 | #include <netinet/in.h> |
515 | #endif /* HAVE_NETINET_IN_H */ | 518 | #endif /* HAVE_NETINET_IN_H */ |
@@ -658,6 +661,9 @@ AC_CHECK_HEADERS([sys/sysctl.h netinet/ip_icmp.h netinet/icmp_var.h], [], [], | |||
658 | #ifdef HAVE_SYS_SOCKET_H | 661 | #ifdef HAVE_SYS_SOCKET_H |
659 | #include <sys/socket.h> | 662 | #include <sys/socket.h> |
660 | #endif /* HAVE_SYS_SOCKET_H */ | 663 | #endif /* HAVE_SYS_SOCKET_H */ |
664 | #ifdef HAVE_NETINET_IN_SYSTM_H | ||
665 | #include <netinet/in_systm.h> | ||
666 | #endif /* HAVE_NETINET_IN_SYSTM_H */ | ||
661 | #ifdef HAVE_NETINET_IN_H | 667 | #ifdef HAVE_NETINET_IN_H |
662 | #include <netinet/in.h> | 668 | #include <netinet/in.h> |
663 | #endif /* HAVE_NETINET_IN_H */ | 669 | #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 @@ | |||
65 | #ifdef HAVE_SYS_SOCKET_H | 65 | #ifdef HAVE_SYS_SOCKET_H |
66 | #include <sys/socket.h> | 66 | #include <sys/socket.h> |
67 | #endif /* HAVE_SYS_SOCKET_H */ | 67 | #endif /* HAVE_SYS_SOCKET_H */ |
68 | #ifdef HAVE_NETINET_IN_SYSTM_H | ||
69 | #include <netinet/in_systm.h> | ||
70 | #endif /* HAVE_NETINET_IN_SYSTM_H */ | ||
68 | #ifdef HAVE_NETINET_IN_H | 71 | #ifdef HAVE_NETINET_IN_H |
69 | #include <netinet/in.h> | 72 | #include <netinet/in.h> |
70 | #endif /* HAVE_NETINET_IN_H */ | 73 | #endif /* HAVE_NETINET_IN_H */ |