diff options
Diffstat (limited to 'src/ext')
| -rw-r--r-- | src/ext/csiphash.c | 4 | ||||
| -rw-r--r-- | src/ext/trunnel/trunnel-impl.h | 3 | ||||
| -rw-r--r-- | src/ext/trunnel/trunnel.c | 4 | ||||
| -rw-r--r-- | src/ext/trunnel/trunnel.h | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/src/ext/csiphash.c b/src/ext/csiphash.c index 49a6dc4778..a8f3d5b8b8 100644 --- a/src/ext/csiphash.c +++ b/src/ext/csiphash.c @@ -53,7 +53,7 @@ #else /* See: http://sourceforge.net/p/predef/wiki/Endianness/ */ -# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(OpenBSD) # include <sys/endian.h> # else # include <endian.h> @@ -62,7 +62,7 @@ __BYTE_ORDER == __LITTLE_ENDIAN # define _le64toh(x) ((uint64_t)(x)) # else -# if defined(__OpenBSD__) +# if defined(OpenBSD) # define _le64toh(x) letoh64(x) # else # define _le64toh(x) le64toh(x) diff --git a/src/ext/trunnel/trunnel-impl.h b/src/ext/trunnel/trunnel-impl.h index 3ffde6e09b..bc805851b1 100644 --- a/src/ext/trunnel/trunnel-impl.h +++ b/src/ext/trunnel/trunnel-impl.h @@ -1,4 +1,4 @@ -/* trunnel-impl.h -- copied from Trunnel v1.4.6 +/* trunnel-impl.h -- copied from Trunnel v1.5.1 * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ @@ -17,6 +17,7 @@ #include "trunnel.h" #include <assert.h> #include <string.h> +#include <stdlib.h> #if defined(_MSC_VER) && (_MSC_VER < 1600) #define uint8_t unsigned char diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c index 3994422643..8f72351277 100644 --- a/src/ext/trunnel/trunnel.c +++ b/src/ext/trunnel/trunnel.c @@ -1,4 +1,4 @@ -/* trunnel.c -- copied from Trunnel v1.4.6 +/* trunnel.c -- copied from Trunnel v1.5.1 * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ @@ -31,7 +31,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> diff --git a/src/ext/trunnel/trunnel.h b/src/ext/trunnel/trunnel.h index 41068b8fb3..85bbcc5451 100644 --- a/src/ext/trunnel/trunnel.h +++ b/src/ext/trunnel/trunnel.h @@ -1,4 +1,4 @@ -/* trunnel.h -- copied from Trunnel v1.4.6 +/* trunnel.h -- copied from Trunnel v1.5.1 * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ |