From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Mon, 30 Apr 2018 15:44:01 +0000 (+0200)
Subject: move includes around to avoid boost L conflict
X-Git-Tag: auth-4.1.2~6^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F6542%2Fhead;p=thirdparty%2Fpdns.git

move includes around to avoid boost L conflict
---

diff --git a/pdns/protobuf.cc b/pdns/protobuf.cc
index 3c9b49a0b3..3359c789ac 100644
--- a/pdns/protobuf.cc
+++ b/pdns/protobuf.cc
@@ -1,6 +1,5 @@
 
 #include "gettime.hh"
-#include "dnsparser.hh"
 #include "protobuf.hh"
 #include "dnsparser.hh"
 #include "gettime.hh"
diff --git a/pdns/protobuf.hh b/pdns/protobuf.hh
index 0fab8fa3ac..9c3785151f 100644
--- a/pdns/protobuf.hh
+++ b/pdns/protobuf.hh
@@ -26,15 +26,15 @@
 
 #include "config.h"
 
-#include "dnsname.hh"
-#include "iputils.hh"
-
 #ifdef HAVE_PROTOBUF
 #include <boost/uuid/uuid.hpp>
 #include <boost/uuid/uuid_generators.hpp>
 #include "dnsmessage.pb.h"
 #endif /* HAVE_PROTOBUF */
 
+#include "dnsname.hh"
+#include "iputils.hh"
+
 class DNSProtoBufMessage
 {
 public: