From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 6 May 2019 07:26:23 +0000 (+0200)
Subject: - Fix #29: Solaris 11.3 and missing symbols be64toh, htobe64.
X-Git-Tag: release-1.9.2rc1~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b7843f87965b8036da1634fb9882272a54c47f3;p=thirdparty%2Funbound.git

- Fix #29: Solaris 11.3 and missing symbols be64toh, htobe64.
---

diff --git a/cachedb/cachedb.c b/cachedb/cachedb.c
index 5a179a2bb..08389a432 100644
--- a/cachedb/cachedb.c
+++ b/cachedb/cachedb.c
@@ -72,6 +72,19 @@
 #  define be64toh(x) OSSwapBigToHostInt64(x)
 #endif
 
+/* Some compilers do not define __BYTE_ORDER__, like IBM XLC on AIX */
+#ifndef be64toh
+#if defined(__sun) || defined(_AIX)
+#  if __BIG_ENDIAN__
+#    define be64toh(n) (n)
+#    define htobe64(n) (n)
+#  else
+#    define be64toh(n) (((uint64_t)htonl((n) & 0xFFFFFFFF) << 32) | htonl((n) >> 32))
+#    define htobe64(n) (((uint64_t)htonl((n) & 0xFFFFFFFF) << 32) | htonl((n) >> 32))
+#  endif
+#endif
+#endif /* be64toh */
+
 /** the unit test testframe for cachedb, its module state contains
  * a cache for a couple queries (in memory). */
 struct testframe_moddata {
diff --git a/doc/Changelog b/doc/Changelog
index d81c3ee44..d6eec9b2a 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+6 May 2019: Wouter
+	- Fix #29: Solaris 11.3 and missing symbols be64toh, htobe64.
+
 2 May 2019: Wouter
 	- contrib/fastrpz.patch updated for code changes, and with git diff.
 	- Fix .gitignore, add pythonmod and dnstap generated files.