diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-01-09 08:52:10 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-01-09 08:52:10 -0500 |
| commit | e6a44012001afb2d4c5956e4b55ccf6b622fd79e (patch) | |
| tree | 293ab440980e317c3d7fe99c67e24f9f155d05f9 /src/ext | |
| parent | a891d81c5f62cdda37b4371ebe2782e23e4f6db1 (diff) | |
| parent | 09472791d0ccf5b527a5b59eceb218aff38c2880 (diff) | |
| download | tor-e6a44012001afb2d4c5956e4b55ccf6b622fd79e.tar.gz tor-e6a44012001afb2d4c5956e4b55ccf6b622fd79e.zip | |
Merge branch 'maint-0.3.5'
Diffstat (limited to 'src/ext')
| -rw-r--r-- | src/ext/byteorder.h | 4 | ||||
| -rw-r--r-- | src/ext/ed25519/donna/ed25519-donna-portable-identify.h | 2 | ||||
| -rw-r--r-- | src/ext/trunnel/trunnel.c | 6 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/ext/byteorder.h b/src/ext/byteorder.h index c8ba52184b..95e080b14d 100644 --- a/src/ext/byteorder.h +++ b/src/ext/byteorder.h @@ -29,6 +29,10 @@ Jean-Philippe Aumasson (https://131002.net/siphash/siphash24.c) */ +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + /* This code is extracted from csiphash.h */ #if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \ diff --git a/src/ext/ed25519/donna/ed25519-donna-portable-identify.h b/src/ext/ed25519/donna/ed25519-donna-portable-identify.h index 26a264cf9e..3e0f9cfc50 100644 --- a/src/ext/ed25519/donna/ed25519-donna-portable-identify.h +++ b/src/ext/ed25519/donna/ed25519-donna-portable-identify.h @@ -14,7 +14,7 @@ #define OS_OSX #elif defined(macintosh) || defined(Macintosh) #define OS_MAC - #elif defined(__OpenBSD__) + #elif defined(OpenBSD) #define OS_OPENBSD #endif #endif diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c index b749d8136f..2442bc3909 100644 --- a/src/ext/trunnel/trunnel.c +++ b/src/ext/trunnel/trunnel.c @@ -14,6 +14,10 @@ #include <stdlib.h> #include <string.h> +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + #if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \ __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ # define IS_LITTLE_ENDIAN 1 @@ -31,7 +35,7 @@ # define IS_LITTLE_ENDIAN # endif #else -# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(OpenBSD) # include <sys/endian.h> # else # include <endian.h> |