aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBrent Cook <busterb@gmail.com>2021-11-09 22:34:58 -0600
committerBrent Cook <busterb@gmail.com>2021-11-09 22:43:53 -0600
commitf69066726257d07257fce6c5f076bbf27f49b376 (patch)
tree2153f8ebec920916dec22ee4e3e23185291bfc2e /include
parentc29f380d0c604efee33672172929c2e57554924f (diff)
downloadportable-f69066726257d07257fce6c5f076bbf27f49b376.tar.gz
portable-f69066726257d07257fce6c5f076bbf27f49b376.tar.bz2
portable-f69066726257d07257fce6c5f076bbf27f49b376.zip
Autoconf updates
Move machine/endian.h to endian.h, use AC_HEADER_RESOLV over individual header checks, and include prerequisites for netinet/ip.h check.
Diffstat (limited to 'include')
-rw-r--r--include/Makefile.am3
-rw-r--r--include/compat/endian.h (renamed from include/compat/machine/endian.h)7
2 files changed, 3 insertions, 7 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index 4184cf8..aed6721 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -7,6 +7,7 @@ SUBDIRS = openssl
7noinst_HEADERS = pqueue.h 7noinst_HEADERS = pqueue.h
8noinst_HEADERS += compat/dirent.h 8noinst_HEADERS += compat/dirent.h
9noinst_HEADERS += compat/dirent_msvc.h 9noinst_HEADERS += compat/dirent_msvc.h
10noinst_HEADERS += compat/endian.h
10noinst_HEADERS += compat/err.h 11noinst_HEADERS += compat/err.h
11noinst_HEADERS += compat/fcntl.h 12noinst_HEADERS += compat/fcntl.h
12noinst_HEADERS += compat/limits.h 13noinst_HEADERS += compat/limits.h
@@ -26,8 +27,6 @@ noinst_HEADERS += compat/win32netcompat.h
26noinst_HEADERS += compat/arpa/inet.h 27noinst_HEADERS += compat/arpa/inet.h
27noinst_HEADERS += compat/arpa/nameser.h 28noinst_HEADERS += compat/arpa/nameser.h
28 29
29noinst_HEADERS += compat/machine/endian.h
30
31noinst_HEADERS += compat/netinet/in.h 30noinst_HEADERS += compat/netinet/in.h
32noinst_HEADERS += compat/netinet/ip.h 31noinst_HEADERS += compat/netinet/ip.h
33noinst_HEADERS += compat/netinet/tcp.h 32noinst_HEADERS += compat/netinet/tcp.h
diff --git a/include/compat/machine/endian.h b/include/compat/endian.h
index bb22f5b..1ed255e 100644
--- a/include/compat/machine/endian.h
+++ b/include/compat/endian.h
@@ -1,6 +1,6 @@
1/* 1/*
2 * Public domain 2 * Public domain
3 * machine/endian.h compatibility shim 3 * endian.h compatibility shim
4 */ 4 */
5 5
6#ifndef LIBCRYPTOCOMPAT_BYTE_ORDER_H_ 6#ifndef LIBCRYPTOCOMPAT_BYTE_ORDER_H_
@@ -22,7 +22,7 @@
22#endif 22#endif
23 23
24#elif defined(HAVE_ENDIAN_H) 24#elif defined(HAVE_ENDIAN_H)
25#include <endian.h> 25#include_next <endian.h>
26 26
27#elif defined(__sun) || defined(_AIX) || defined(__hpux) 27#elif defined(__sun) || defined(_AIX) || defined(__hpux)
28#include <sys/types.h> 28#include <sys/types.h>
@@ -32,9 +32,6 @@
32#include <standards.h> 32#include <standards.h>
33#include <sys/endian.h> 33#include <sys/endian.h>
34 34
35#else
36#include_next <machine/endian.h>
37
38#endif 35#endif
39 36
40#ifndef __STRICT_ALIGNMENT 37#ifndef __STRICT_ALIGNMENT