From: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Date: Thu, 14 Jan 2016 19:40:40 +0000 (-0500)
Subject: don't pollute the namespace with DS register definition
X-Git-Tag: dnsdist-1.0.0-alpha2~74^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e377f866a3bdb01b4e0571e8b012d9d902de06ce;p=pdns

don't pollute the namespace with DS register definition

DS is part of the i386 ABI that's pulled in via ucontext.h.

closes #3239
---

diff --git a/pdns/dnsrecords.cc b/pdns/dnsrecords.cc
index 5e89bbc31..9bf357e32 100644
--- a/pdns/dnsrecords.cc
+++ b/pdns/dnsrecords.cc
@@ -312,7 +312,6 @@ boilerplate_conv(OPENPGPKEY, 61,
                  conv.xfrBlob(d_keyring);
                  )
 
-#undef DS
 DSRecordContent::DSRecordContent() {}
 boilerplate_conv(DS, 43, 
                  conv.xfr16BitInt(d_tag); 
diff --git a/pdns/mtasker.hh b/pdns/mtasker.hh
index 6f9ce7043..d79691e3f 100644
--- a/pdns/mtasker.hh
+++ b/pdns/mtasker.hh
@@ -24,6 +24,8 @@
 #include <stdint.h>
 #include <signal.h>
 #include <ucontext.h>
+// don't pollute the namespace with the DS register (i386 only)
+#undef DS
 #include <queue>
 #include <vector>
 #include <map>
diff --git a/pdns/qtype.hh b/pdns/qtype.hh
index 07d1a6db7..2228af201 100644
--- a/pdns/qtype.hh
+++ b/pdns/qtype.hh
@@ -78,7 +78,6 @@ public:
 
   static int chartocode(const char *p); //!< convert a character string to a code
 // more solaris fun
-#undef DS
   enum typeenum : uint16_t {
     A=1,
     NS=2,