diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-08 16:46:34 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-08 16:46:34 -0400 |
| commit | 08ced4a7bf17f5c9d2868649dfa844248d15614e (patch) | |
| tree | 2db08d800bd30abf5fc13e4170d59df24bae9748 | |
| parent | 689863d0a9432250f2c9a67e3e7ba2c4e5dae4c6 (diff) | |
| parent | 9ccedbece0052cf743d5e5703e1676cda6cab733 (diff) | |
| download | tor-08ced4a7bf17f5c9d2868649dfa844248d15614e.tar.gz tor-08ced4a7bf17f5c9d2868649dfa844248d15614e.zip | |
Merge remote-tracking branch 'public/bug11426'
| -rw-r--r-- | changes/bug11426 | 3 | ||||
| -rw-r--r-- | src/ext/csiphash.c | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug11426 b/changes/bug11426 new file mode 100644 index 0000000000..23b1e7d9c7 --- /dev/null +++ b/changes/bug11426 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Fix compilation on Solaris, which does not have <endian.h>. + Fixes bug 11426; bugfix on 0.2.5.3-alpha. diff --git a/src/ext/csiphash.c b/src/ext/csiphash.c index 2a96f28815..c247886038 100644 --- a/src/ext/csiphash.c +++ b/src/ext/csiphash.c @@ -46,6 +46,10 @@ #elif defined(__APPLE__) # include <libkern/OSByteOrder.h> # define _le64toh(x) OSSwapLittleToHostInt64(x) +#elif defined(sun) || defined(__sun) +# include <sys/byteorder.h> +# define _le64toh(x) LE_64(x) + #else /* See: http://sourceforge.net/p/predef/wiki/Endianness/ */ |