make burtlemix an (inline) function

diff --git a/pdns/burtle.hh b/pdns/burtle.hh
index 4d56936b3ae84617bb03e935580562090fb639ab..53f8b8d017b1af40f7cfbd553df4cd65162668a7 100644 (file)
--- a/pdns/burtle.hh
+++ b/pdns/burtle.hh
@@ -24,36 +24,36 @@
 
 #include <cinttypes>
 
-#define burtlemix(a, b, c) \
-  {                        \
-    a -= b;                \
-    a -= c;                \
-    a ^= (c >> 13);        \
-    b -= c;                \
-    b -= a;                \
-    b ^= (a << 8);         \
-    c -= a;                \
-    c -= b;                \
-    c ^= (b >> 13);        \
-    a -= b;                \
-    a -= c;                \
-    a ^= (c >> 12);        \
-    b -= c;                \
-    b -= a;                \
-    b ^= (a << 16);        \
-    c -= a;                \
-    c -= b;                \
-    c ^= (b >> 5);         \
-    a -= b;                \
-    a -= c;                \
-    a ^= (c >> 3);         \
-    b -= c;                \
-    b -= a;                \
-    b ^= (a << 10);        \
-    c -= a;                \
-    c -= b;                \
-    c ^= (b >> 15);        \
-  }
+inline void burtlemix(uint32_t& a, uint32_t& b, uint32_t& c)
+{
+  a -= b;
+  a -= c;
+  a ^= (c >> 13);
+  b -= c;
+  b -= a;
+  b ^= (a << 8);
+  c -= a;
+  c -= b;
+  c ^= (b >> 13);
+  a -= b;
+  a -= c;
+  a ^= (c >> 12);
+  b -= c;
+  b -= a;
+  b ^= (a << 16);
+  c -= a;
+  c -= b;
+  c ^= (b >> 5);
+  a -= b;
+  a -= c;
+  a ^= (c >> 3);
+  b -= c;
+  b -= a;
+  b ^= (a << 10);
+  c -= a;
+  c -= b;
+  c ^= (b >> 15);
+}
 
 inline uint32_t burtle(const unsigned char* k, uint32_t length, uint32_t initval)
 {

diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index 99abefede61d1d8dc1fcf730c3f2b7300e771d52..f1722e29044849d4f524c5ec3f317a6c5ff8589d 100644 (file)
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -124,8 +124,8 @@ dnsdist-lua-ffi.$(OBJEXT): dnsdist-lua-ffi-interface.inc
 
 dnsdist_SOURCES = \
        base64.hh \
-       burtle.hh \
        bpf-filter.cc bpf-filter.hh \
+       burtle.hh \
        cachecleaner.hh \
        capabilities.cc capabilities.hh \
        circular_buffer.hh \