From: Roman Dayneko <roman.dayneko@gmail.com>
Date: Wed, 11 Jan 2017 14:46:17 +0000 (+0200)
Subject: issue #4579
X-Git-Tag: rec-4.0.5-rc1~1^2~10^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c5ffd908924e98f8e151c6298b3263fb2b65d2df;p=thirdparty%2Fpdns.git

issue #4579

(cherry picked from commit 28fe507d1acc3b4fe7b5669caac9f4bd4a516093)
---

diff --git a/pdns/iputils.hh b/pdns/iputils.hh
index 683d9e9bfb..2fdc7f7ebe 100644
--- a/pdns/iputils.hh
+++ b/pdns/iputils.hh
@@ -59,23 +59,22 @@
 #define le64toh(x) OSSwapLittleToHostInt64(x)
 #endif
 
-// for illumos
-#ifdef BE_64
+#ifdef __sun
 
 #define htobe16(x) BE_16(x)
 #define htole16(x) LE_16(x)
-#define be16toh(x) BE_IN16(x)
-#define le16toh(x) LE_IN16(x)
+#define be16toh(x) BE_IN16(&(x))
+#define le16toh(x) LE_IN16(&(x))
 
 #define htobe32(x) BE_32(x)
 #define htole32(x) LE_32(x)
-#define be32toh(x) BE_IN32(x)
-#define le32toh(x) LE_IN32(x)
+#define be32toh(x) BE_IN32(&(x))
+#define le32toh(x) LE_IN32(&(x))
 
 #define htobe64(x) BE_64(x)
 #define htole64(x) LE_64(x)
-#define be64toh(x) BE_IN64(x)
-#define le64toh(x) LE_IN64(x)
+#define be64toh(x) BE_IN64(&(x))
+#define le64toh(x) LE_IN64(&(x))
 
 #endif