From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 7 Apr 2014 17:07:14 +0000 (-0400)
Subject: Make csiphash use the proper endian-converter on solaris
X-Git-Tag: tor-0.2.5.4-alpha~62^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ccedbece0052cf743d5e5703e1676cda6cab733;p=thirdparty%2Ftor.git

Make csiphash use the proper endian-converter on solaris

fixes bug 11426; bugfix on 0.2.5.3-alpha, where csiphash was
introduced.
---

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/ */