diff options
author | Jonas 'Sortie' Termansen <sortie@maxsi.org> | 2021-10-03 13:33:16 +0200 |
---|---|---|
committer | Jonas 'Sortie' Termansen <sortie@maxsi.org> | 2021-10-03 13:33:16 +0200 |
commit | fcf6c877881626ee2ac94fc77051c79e3f7ae7ce (patch) | |
tree | 7634390a1cac4c517bae21b9e8b212949c27bc2f /include | |
parent | 691c7c7514c1f46e7d40619c4833094bd1c24571 (diff) | |
download | portable-fcf6c877881626ee2ac94fc77051c79e3f7ae7ce.tar.gz portable-fcf6c877881626ee2ac94fc77051c79e3f7ae7ce.tar.bz2 portable-fcf6c877881626ee2ac94fc77051c79e3f7ae7ce.zip |
Support operating systems without some non-POSIX headers
The arpa/nameser.h, netinet/ip.h, and resolv.h headers are not crucial
to building LibreSSL. The netinet/ip.h header is used in nc(1) for
optional IPTOS_ features that can be ifdef'd on systems without support.
The endian.h header is the upcoming standard header and should be used
whenever available and correct. The machine/endian.h header is
non-standard and doesn't have to exist on POSIX systems.
Fix the check for getpagesize(3) not forward declaring the function,
such that CFLAGS with -Werror=implicit-function-declaration doesn't
cause the check to fail.
Diffstat (limited to 'include')
-rw-r--r-- | include/compat/arpa/nameser.h | 2 | ||||
-rw-r--r-- | include/compat/machine/endian.h | 2 | ||||
-rw-r--r-- | include/compat/netinet/ip.h | 2 | ||||
-rw-r--r-- | include/compat/resolv.h | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/include/compat/arpa/nameser.h b/include/compat/arpa/nameser.h index 0126a60..eff3b0d 100644 --- a/include/compat/arpa/nameser.h +++ b/include/compat/arpa/nameser.h | |||
@@ -4,7 +4,9 @@ | |||
4 | */ | 4 | */ |
5 | 5 | ||
6 | #ifndef _WIN32 | 6 | #ifndef _WIN32 |
7 | #ifdef HAVE_ARPA_NAMESER_H | ||
7 | #include_next <arpa/nameser.h> | 8 | #include_next <arpa/nameser.h> |
9 | #endif | ||
8 | #else | 10 | #else |
9 | #include <win32netcompat.h> | 11 | #include <win32netcompat.h> |
10 | 12 | ||
diff --git a/include/compat/machine/endian.h b/include/compat/machine/endian.h index 4dcb60d..bb22f5b 100644 --- a/include/compat/machine/endian.h +++ b/include/compat/machine/endian.h | |||
@@ -21,7 +21,7 @@ | |||
21 | #define BYTE_ORDER BIG_ENDIAN | 21 | #define BYTE_ORDER BIG_ENDIAN |
22 | #endif | 22 | #endif |
23 | 23 | ||
24 | #elif defined(__linux__) || defined(__midipix__) | 24 | #elif defined(HAVE_ENDIAN_H) |
25 | #include <endian.h> | 25 | #include <endian.h> |
26 | 26 | ||
27 | #elif defined(__sun) || defined(_AIX) || defined(__hpux) | 27 | #elif defined(__sun) || defined(_AIX) || defined(__hpux) |
diff --git a/include/compat/netinet/ip.h b/include/compat/netinet/ip.h index 6019f7d..29f17f3 100644 --- a/include/compat/netinet/ip.h +++ b/include/compat/netinet/ip.h | |||
@@ -8,7 +8,9 @@ | |||
8 | #endif | 8 | #endif |
9 | 9 | ||
10 | #ifndef _WIN32 | 10 | #ifndef _WIN32 |
11 | #ifdef HAVE_NETINET_IP_H | ||
11 | #include_next <netinet/ip.h> | 12 | #include_next <netinet/ip.h> |
13 | #endif | ||
12 | #else | 14 | #else |
13 | #include <win32netcompat.h> | 15 | #include <win32netcompat.h> |
14 | #endif | 16 | #endif |
diff --git a/include/compat/resolv.h b/include/compat/resolv.h index 42dec07..b804460 100644 --- a/include/compat/resolv.h +++ b/include/compat/resolv.h | |||
@@ -12,7 +12,7 @@ | |||
12 | #else | 12 | #else |
13 | #include <../include/resolv.h> | 13 | #include <../include/resolv.h> |
14 | #endif | 14 | #endif |
15 | #else | 15 | #elif defined(HAVE_RESOLV_H) |
16 | #include_next <resolv.h> | 16 | #include_next <resolv.h> |
17 | #endif | 17 | #endif |
18 | 18 | ||