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 5e89bbc312a6e9ec1313556dfee2b08331b51959..9bf357e322fc754b5b89b88f2cb3970018fd728b 100644 (file)
--- 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 6f9ce7043f294b4997e152696e9963e3402fe2ad..d79691e3f186f82456be358d9974af414f6ba114 100644 (file)
--- 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 07d1a6db753c43e737e25f464fcc7d1f420a5d96..2228af201e6e939a90c7d3723e37e9d68f24c2e7 100644 (file)
--- 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,