From 870a0fe4b5d567e16ad53bc8940db95e9e9ceef9 Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Tue, 24 Feb 2015 09:44:16 +0200 Subject: [PATCH] Include config.h only in .cc files Including config.h in header files can make it difficult to make the header files public in future, also, including config.h only in compilation units ensures it's only included once. --- modules/bindbackend/bindbackend2.cc | 3 +++ modules/bindbackend/binddnssec.cc | 4 +++- modules/geobackend/geobackend.cc | 3 +++ modules/geobackend/ippreftree.cc | 3 +++ modules/geoipbackend/geoipbackend.cc | 3 +++ modules/geoipbackend/geoipbackend.hh | 1 - modules/gmysqlbackend/gmysqlbackend.cc | 3 +++ modules/gmysqlbackend/smysql.cc | 3 +++ modules/goraclebackend/goraclebackend.cc | 3 +++ modules/goraclebackend/soracle.cc | 3 +++ modules/gpgsqlbackend/gpgsqlbackend.cc | 3 +++ modules/gpgsqlbackend/spgsql.cc | 3 +++ modules/gsqlite3backend/gsqlite3backend.cc | 3 +++ modules/ldapbackend/ldapbackend.cc | 3 +++ modules/ldapbackend/ldapbackend.hh | 3 --- modules/ldapbackend/powerldap.cc | 3 +++ modules/ldapbackend/powerldap.hh | 3 --- modules/lmdbbackend/lmdbbackend.cc | 3 +++ modules/luabackend/dnssec.cc | 3 +++ modules/luabackend/lua_functions.cc | 3 +++ modules/luabackend/luabackend.cc | 3 +++ modules/luabackend/master.cc | 3 +++ modules/luabackend/minimal.cc | 3 +++ modules/luabackend/private.cc | 3 +++ modules/luabackend/reload.cc | 3 +++ modules/luabackend/slave.cc | 3 +++ modules/luabackend/supermaster.cc | 3 +++ modules/mydnsbackend/mydnsbackend.cc | 3 +++ modules/opendbxbackend/odbxbackend.cc | 3 +++ modules/opendbxbackend/odbxprivate.cc | 3 +++ modules/oraclebackend/oraclebackend.cc | 3 +++ modules/pipebackend/coprocess.cc | 3 +++ modules/pipebackend/pipebackend.cc | 3 +++ modules/randombackend/randombackend.cc | 3 +++ modules/remotebackend/httpconnector.cc | 3 +++ modules/remotebackend/pipeconnector.cc | 3 +++ modules/remotebackend/remotebackend.cc | 3 +++ modules/remotebackend/test-remotebackend-http.cc | 3 +++ modules/remotebackend/test-remotebackend-json.cc | 3 +++ modules/remotebackend/test-remotebackend-pipe.cc | 3 +++ modules/remotebackend/test-remotebackend-post.cc | 3 +++ modules/remotebackend/test-remotebackend-unix.cc | 3 +++ modules/remotebackend/test-remotebackend-zeromq.cc | 3 +++ modules/remotebackend/test-remotebackend.cc | 3 +++ modules/remotebackend/unixconnector.cc | 3 +++ modules/remotebackend/zmqconnector.cc | 3 +++ modules/tinydnsbackend/cdb.cc | 3 +++ modules/tinydnsbackend/tinydnsbackend.cc | 3 +++ pdns/arguments.cc | 3 +++ pdns/auth-carbon.cc | 3 +++ pdns/backends/gsql/gsqlbackend.cc | 3 +++ pdns/base32.cc | 3 +++ pdns/base64.cc | 3 +++ pdns/botan110signers.cc | 3 +++ pdns/botan18signers.cc | 3 +++ pdns/botansigners.cc | 3 +++ pdns/calidns.cc | 3 +++ pdns/common_startup.cc | 3 +++ pdns/communicator.cc | 3 +++ pdns/cryptoppsigners.cc | 3 +++ pdns/dbdnsseckeeper.cc | 3 +++ pdns/devpollmplexer.cc | 3 +++ pdns/dns.cc | 3 +++ pdns/dns_random.cc | 3 +++ pdns/dnsbackend.cc | 3 +++ pdns/dnsbulktest.cc | 3 +++ pdns/dnsdemog.cc | 3 +++ pdns/dnsdist.cc | 3 +++ pdns/dnsgram.cc | 3 +++ pdns/dnspacket.cc | 3 +++ pdns/dnspacket.hh | 3 --- pdns/dnsparser.cc | 3 +++ pdns/dnspcap.cc | 3 +++ pdns/dnsproxy.cc | 3 +++ pdns/dnsrecords.cc | 3 +++ pdns/dnsreplay.cc | 3 +++ pdns/dnsscan.cc | 3 +++ pdns/dnsscope.cc | 3 +++ pdns/dnssecinfra.cc | 3 +++ pdns/dnssecsigner.cc | 3 +++ pdns/dnstcpbench.cc | 3 +++ pdns/dnswasher.cc | 3 +++ pdns/dnswriter.cc | 3 +++ pdns/dumresp.cc | 3 +++ pdns/dynhandler.cc | 3 +++ pdns/dynhandler.hh | 1 - pdns/dynlistener.cc | 3 +++ pdns/dynloader.cc | 4 +++- pdns/dynmessenger.cc | 3 +++ pdns/ed25519signers.cc | 3 +++ pdns/ednssubnet.cc | 3 +++ pdns/epollmplexer.cc | 3 +++ pdns/inflighter.cc | 3 +++ pdns/iputils.cc | 3 +++ pdns/json.cc | 3 +++ pdns/kqueuemplexer.cc | 3 +++ pdns/logger.cc | 4 +++- pdns/logger.hh | 1 - pdns/lua-auth.cc | 3 +++ pdns/lua-iputils.cc | 2 ++ pdns/lua-pdns.cc | 4 +++- pdns/lua-recursor.cc | 4 +++- pdns/lwres.cc | 3 +++ pdns/mastercommunicator.cc | 3 +++ pdns/misc.cc | 3 +++ pdns/mtasker.cc | 3 +++ pdns/nameserver.cc | 3 +++ pdns/notify.cc | 3 +++ pdns/nproxy.cc | 3 +++ pdns/nsec3dig.cc | 3 +++ pdns/nsecrecords.cc | 3 +++ pdns/packetcache.cc | 3 +++ pdns/packethandler.cc | 3 +++ pdns/pdns_hw.cc | 3 +++ pdns/pdns_recursor.cc | 3 +++ pdns/pdnssec.cc | 3 +++ pdns/pkcs11signers.cc | 3 +++ pdns/polarrsakeyinfra.cc | 3 +++ pdns/pollmplexer.cc | 3 +++ pdns/portsmplexer.cc | 3 +++ pdns/qtype.cc | 3 +++ pdns/randomhelper.cc | 3 +++ pdns/rcpgenerator.cc | 3 +++ pdns/rec-carbon.cc | 3 +++ pdns/rec_channel.cc | 3 +++ pdns/rec_channel_rec.cc | 3 +++ pdns/rec_control.cc | 4 +++- pdns/receiver.cc | 4 +++- pdns/recpacketcache.cc | 3 +++ pdns/recursor_cache.cc | 4 +++- pdns/reczones.cc | 3 +++ pdns/resolver.cc | 3 +++ pdns/responsestats.cc | 3 +++ pdns/rfc2136handler.cc | 3 +++ pdns/saxfr.cc | 3 +++ pdns/sdig.cc | 3 +++ pdns/secpoll-auth.cc | 3 +++ pdns/secpoll-recursor.cc | 3 +++ pdns/selectmplexer.cc | 3 +++ pdns/serialtweaker.cc | 3 +++ pdns/signingpipe.cc | 3 +++ pdns/sillyrecords.cc | 3 +++ pdns/slavecommunicator.cc | 3 +++ pdns/speedtest.cc | 2 +- pdns/ssqlite3.cc | 3 +++ pdns/statbag.cc | 3 +++ pdns/syncres.cc | 3 +++ pdns/tcpreceiver.cc | 3 +++ pdns/test-base32_cc.cc | 3 +++ pdns/test-base64_cc.cc | 3 +++ pdns/test-bindparser_cc.cc | 3 +++ pdns/test-dns_random_hh.cc | 3 +++ pdns/test-dnsrecords_cc.cc | 3 +++ pdns/test-iputils_hh.cc | 3 +++ pdns/test-md5_hh.cc | 3 +++ pdns/test-misc_hh.cc | 3 +++ pdns/test-nameserver_cc.cc | 3 +++ pdns/test-packetcache_cc.cc | 3 +++ pdns/test-rcpgenerator_cc.cc | 3 +++ pdns/test-sha_hh.cc | 3 +++ pdns/test-statbag_cc.cc | 3 +++ pdns/test-zoneparser_tng_cc.cc | 3 +++ pdns/testrunner.cc | 3 +++ pdns/toysdig.cc | 3 +++ pdns/tsig-tests.cc | 3 +++ pdns/ueberbackend.cc | 6 +++--- pdns/unix_semaphore.cc | 3 +++ pdns/unix_utility.cc | 3 +++ pdns/version.cc | 3 +++ pdns/webserver.cc | 3 +++ pdns/ws-api.cc | 4 +++- pdns/ws-auth.cc | 6 +++--- pdns/ws-recursor.cc | 3 +++ pdns/zone2json.cc | 3 +++ pdns/zone2ldap.cc | 3 +++ pdns/zone2lmdb.cc | 3 +++ pdns/zone2sql.cc | 3 +++ pdns/zoneparser-tng.cc | 3 +++ 178 files changed, 513 insertions(+), 28 deletions(-) diff --git a/modules/bindbackend/bindbackend2.cc b/modules/bindbackend/bindbackend2.cc index 74696f0aa..0605c30df 100644 --- a/modules/bindbackend/bindbackend2.cc +++ b/modules/bindbackend/bindbackend2.cc @@ -20,6 +20,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/modules/bindbackend/binddnssec.cc b/modules/bindbackend/binddnssec.cc index c5c63700c..a4f717250 100644 --- a/modules/bindbackend/binddnssec.cc +++ b/modules/bindbackend/binddnssec.cc @@ -19,11 +19,13 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "bindbackend2.hh" #include "pdns/dnsrecords.hh" #include "pdns/bind-dnssec.schema.sqlite3.sql.h" #include -#include "config.h" #include "pdns/arguments.hh" #ifndef HAVE_SQLITE3 diff --git a/modules/geobackend/geobackend.cc b/modules/geobackend/geobackend.cc index 15550247a..5d7eb18fc 100644 --- a/modules/geobackend/geobackend.cc +++ b/modules/geobackend/geobackend.cc @@ -5,6 +5,9 @@ * $Id$ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/modules/geobackend/ippreftree.cc b/modules/geobackend/ippreftree.cc index db078f044..fa0ee4648 100644 --- a/modules/geobackend/ippreftree.cc +++ b/modules/geobackend/ippreftree.cc @@ -5,6 +5,9 @@ * $Id$ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "ippreftree.hh" diff --git a/modules/geoipbackend/geoipbackend.cc b/modules/geoipbackend/geoipbackend.cc index 023d322c4..dccbc2fd0 100644 --- a/modules/geoipbackend/geoipbackend.cc +++ b/modules/geoipbackend/geoipbackend.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "geoipbackend.hh" #include #include diff --git a/modules/geoipbackend/geoipbackend.hh b/modules/geoipbackend/geoipbackend.hh index 4c2e8acdf..b4f461463 100644 --- a/modules/geoipbackend/geoipbackend.hh +++ b/modules/geoipbackend/geoipbackend.hh @@ -1,7 +1,6 @@ #ifndef PDNS_GEOIPBACKEND_HH #define PDNS_GEOIPBACKEND_HH -#include "config.h" #include "pdns/namespaces.hh" #include diff --git a/modules/gmysqlbackend/gmysqlbackend.cc b/modules/gmysqlbackend/gmysqlbackend.cc index 5485b4b85..4f7425c35 100644 --- a/modules/gmysqlbackend/gmysqlbackend.cc +++ b/modules/gmysqlbackend/gmysqlbackend.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include "pdns/namespaces.hh" diff --git a/modules/gmysqlbackend/smysql.cc b/modules/gmysqlbackend/smysql.cc index 6510dde46..3dedab2cd 100644 --- a/modules/gmysqlbackend/smysql.cc +++ b/modules/gmysqlbackend/smysql.cc @@ -1,6 +1,9 @@ /* Copyright 2001 Netherlabs BV, bert.hubert@netherlabs.nl. See LICENSE for more information. $Id$ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "smysql.hh" #include #include diff --git a/modules/goraclebackend/goraclebackend.cc b/modules/goraclebackend/goraclebackend.cc index fe2d5ec8c..1f4d9f647 100644 --- a/modules/goraclebackend/goraclebackend.cc +++ b/modules/goraclebackend/goraclebackend.cc @@ -1,4 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include "pdns/namespaces.hh" diff --git a/modules/goraclebackend/soracle.cc b/modules/goraclebackend/soracle.cc index 0759dfd29..42e675ed7 100644 --- a/modules/goraclebackend/soracle.cc +++ b/modules/goraclebackend/soracle.cc @@ -1,6 +1,9 @@ /* Copyright 2005 Netherlabs BV, bert.hubert@netherlabs.nl. See LICENSE for more information. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "soracle.hh" #include #include diff --git a/modules/gpgsqlbackend/gpgsqlbackend.cc b/modules/gpgsqlbackend/gpgsqlbackend.cc index 6cc824e1f..01162c6df 100644 --- a/modules/gpgsqlbackend/gpgsqlbackend.cc +++ b/modules/gpgsqlbackend/gpgsqlbackend.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include "pdns/namespaces.hh" diff --git a/modules/gpgsqlbackend/spgsql.cc b/modules/gpgsqlbackend/spgsql.cc index f30a3dadd..3e19fa848 100644 --- a/modules/gpgsqlbackend/spgsql.cc +++ b/modules/gpgsqlbackend/spgsql.cc @@ -1,5 +1,8 @@ /* Copyright 2003 - 2005 Netherlabs BV, bert.hubert@netherlabs.nl. See LICENSE for more information. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "spgsql.hh" diff --git a/modules/gsqlite3backend/gsqlite3backend.cc b/modules/gsqlite3backend/gsqlite3backend.cc index 7a03716b8..c6a2b91b7 100644 --- a/modules/gsqlite3backend/gsqlite3backend.cc +++ b/modules/gsqlite3backend/gsqlite3backend.cc @@ -4,6 +4,9 @@ // Copyright (C) 2011, PowerDNS.COM BV // +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "pdns/utility.hh" #include #include diff --git a/modules/ldapbackend/ldapbackend.cc b/modules/ldapbackend/ldapbackend.cc index 0eda8630b..aafa4dd01 100644 --- a/modules/ldapbackend/ldapbackend.cc +++ b/modules/ldapbackend/ldapbackend.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "ldapbackend.hh" diff --git a/modules/ldapbackend/ldapbackend.hh b/modules/ldapbackend/ldapbackend.hh index b48b971a4..ca9db96ff 100644 --- a/modules/ldapbackend/ldapbackend.hh +++ b/modules/ldapbackend/ldapbackend.hh @@ -36,9 +36,6 @@ #include "powerldap.hh" #include "utils.hh" -#ifdef HAVE_CONFIG_H -#include -#endif #ifndef LDAPBACKEND_HH diff --git a/modules/ldapbackend/powerldap.cc b/modules/ldapbackend/powerldap.cc index 18006462a..dcb01b676 100644 --- a/modules/ldapbackend/powerldap.cc +++ b/modules/ldapbackend/powerldap.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "powerldap.hh" #include "pdns/misc.hh" #include diff --git a/modules/ldapbackend/powerldap.hh b/modules/ldapbackend/powerldap.hh index a2ae07987..b585eff8b 100644 --- a/modules/ldapbackend/powerldap.hh +++ b/modules/ldapbackend/powerldap.hh @@ -29,9 +29,6 @@ #include #include -#ifdef HAVE_CONFIG_H -#include -#endif diff --git a/modules/lmdbbackend/lmdbbackend.cc b/modules/lmdbbackend/lmdbbackend.cc index eb3c57b80..6d4acb6ee 100644 --- a/modules/lmdbbackend/lmdbbackend.cc +++ b/modules/lmdbbackend/lmdbbackend.cc @@ -12,6 +12,9 @@ * script which generates a simple zone. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "pdns/utility.hh" #include "pdns/dnsbackend.hh" #include "pdns/dns.hh" diff --git a/modules/luabackend/dnssec.cc b/modules/luabackend/dnssec.cc index 0988b2887..401bdcdc1 100644 --- a/modules/luabackend/dnssec.cc +++ b/modules/luabackend/dnssec.cc @@ -16,6 +16,9 @@ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "luabackend.hh" #include "pdns/logger.hh" diff --git a/modules/luabackend/lua_functions.cc b/modules/luabackend/lua_functions.cc index b30c13f4d..1a8483155 100644 --- a/modules/luabackend/lua_functions.cc +++ b/modules/luabackend/lua_functions.cc @@ -17,6 +17,9 @@ #define LUABACKEND_EXTERN_F_HH +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "luabackend.hh" #include "pdns/logger.hh" diff --git a/modules/luabackend/luabackend.cc b/modules/luabackend/luabackend.cc index 9391e6253..cfddf4f7c 100644 --- a/modules/luabackend/luabackend.cc +++ b/modules/luabackend/luabackend.cc @@ -15,6 +15,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "luabackend.hh" #include "pdns/logger.hh" diff --git a/modules/luabackend/master.cc b/modules/luabackend/master.cc index d607e2447..fd9a9a817 100644 --- a/modules/luabackend/master.cc +++ b/modules/luabackend/master.cc @@ -16,6 +16,9 @@ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "luabackend.hh" #include "pdns/logger.hh" diff --git a/modules/luabackend/minimal.cc b/modules/luabackend/minimal.cc index cc4247fbd..d92a7d9f8 100644 --- a/modules/luabackend/minimal.cc +++ b/modules/luabackend/minimal.cc @@ -15,6 +15,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "luabackend.hh" #include "pdns/logger.hh" diff --git a/modules/luabackend/private.cc b/modules/luabackend/private.cc index 270265c16..9ee1cf169 100644 --- a/modules/luabackend/private.cc +++ b/modules/luabackend/private.cc @@ -15,6 +15,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "luabackend.hh" #include "pdns/logger.hh" diff --git a/modules/luabackend/reload.cc b/modules/luabackend/reload.cc index 34db96a07..6a74ab13b 100644 --- a/modules/luabackend/reload.cc +++ b/modules/luabackend/reload.cc @@ -16,6 +16,9 @@ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "luabackend.hh" #include "pdns/logger.hh" diff --git a/modules/luabackend/slave.cc b/modules/luabackend/slave.cc index 729286cb0..8f60b14b8 100644 --- a/modules/luabackend/slave.cc +++ b/modules/luabackend/slave.cc @@ -16,6 +16,9 @@ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "luabackend.hh" #include "pdns/logger.hh" diff --git a/modules/luabackend/supermaster.cc b/modules/luabackend/supermaster.cc index a877352f5..9360356d4 100644 --- a/modules/luabackend/supermaster.cc +++ b/modules/luabackend/supermaster.cc @@ -16,6 +16,9 @@ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "luabackend.hh" #include "pdns/logger.hh" diff --git a/modules/mydnsbackend/mydnsbackend.cc b/modules/mydnsbackend/mydnsbackend.cc index a46e350d7..80ee38a34 100644 --- a/modules/mydnsbackend/mydnsbackend.cc +++ b/modules/mydnsbackend/mydnsbackend.cc @@ -19,6 +19,9 @@ * If you do not know what mydns is: http://mydns.bboy.net/ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/modules/opendbxbackend/odbxbackend.cc b/modules/opendbxbackend/odbxbackend.cc index 80df4debf..fd6cc1987 100644 --- a/modules/opendbxbackend/odbxbackend.cc +++ b/modules/opendbxbackend/odbxbackend.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "odbxbackend.hh" diff --git a/modules/opendbxbackend/odbxprivate.cc b/modules/opendbxbackend/odbxprivate.cc index a5f1bec85..399f5f076 100644 --- a/modules/opendbxbackend/odbxprivate.cc +++ b/modules/opendbxbackend/odbxprivate.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "odbxbackend.hh" diff --git a/modules/oraclebackend/oraclebackend.cc b/modules/oraclebackend/oraclebackend.cc index 7d2cdc450..40cfa58d9 100644 --- a/modules/oraclebackend/oraclebackend.cc +++ b/modules/oraclebackend/oraclebackend.cc @@ -9,6 +9,9 @@ * */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include diff --git a/modules/pipebackend/coprocess.cc b/modules/pipebackend/coprocess.cc index ee1415f37..06860ff0b 100644 --- a/modules/pipebackend/coprocess.cc +++ b/modules/pipebackend/coprocess.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "coprocess.hh" #include #include diff --git a/modules/pipebackend/pipebackend.cc b/modules/pipebackend/pipebackend.cc index b8f68d764..adf74ed9d 100644 --- a/modules/pipebackend/pipebackend.cc +++ b/modules/pipebackend/pipebackend.cc @@ -3,6 +3,9 @@ // Version : $Id$ // +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/modules/randombackend/randombackend.cc b/modules/randombackend/randombackend.cc index 1244410a2..b70dfa07d 100644 --- a/modules/randombackend/randombackend.cc +++ b/modules/randombackend/randombackend.cc @@ -19,6 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "pdns/utility.hh" #include "pdns/dnsbackend.hh" #include "pdns/dns.hh" diff --git a/modules/remotebackend/httpconnector.cc b/modules/remotebackend/httpconnector.cc index b74d105a9..e4c97e993 100644 --- a/modules/remotebackend/httpconnector.cc +++ b/modules/remotebackend/httpconnector.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "remotebackend.hh" #include #include diff --git a/modules/remotebackend/pipeconnector.cc b/modules/remotebackend/pipeconnector.cc index 140132a20..76962921d 100644 --- a/modules/remotebackend/pipeconnector.cc +++ b/modules/remotebackend/pipeconnector.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include "remotebackend.hh" diff --git a/modules/remotebackend/remotebackend.cc b/modules/remotebackend/remotebackend.cc index 47dbad905..fe86a0895 100644 --- a/modules/remotebackend/remotebackend.cc +++ b/modules/remotebackend/remotebackend.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "remotebackend.hh" #include diff --git a/modules/remotebackend/test-remotebackend-http.cc b/modules/remotebackend/test-remotebackend-http.cc index 4a84792e0..b37503572 100644 --- a/modules/remotebackend/test-remotebackend-http.cc +++ b/modules/remotebackend/test-remotebackend-http.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "pdns/namespaces.hh" #include "pdns/dns.hh" #include "pdns/dnsbackend.hh" diff --git a/modules/remotebackend/test-remotebackend-json.cc b/modules/remotebackend/test-remotebackend-json.cc index 402986e8f..536f8e013 100644 --- a/modules/remotebackend/test-remotebackend-json.cc +++ b/modules/remotebackend/test-remotebackend-json.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "pdns/namespaces.hh" #include "pdns/dns.hh" #include "pdns/dnsbackend.hh" diff --git a/modules/remotebackend/test-remotebackend-pipe.cc b/modules/remotebackend/test-remotebackend-pipe.cc index 687a45499..5a3b1d3a5 100644 --- a/modules/remotebackend/test-remotebackend-pipe.cc +++ b/modules/remotebackend/test-remotebackend-pipe.cc @@ -2,6 +2,9 @@ #define BOOST_TEST_MAIN #define BOOST_TEST_MODULE unit +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/modules/remotebackend/test-remotebackend-post.cc b/modules/remotebackend/test-remotebackend-post.cc index 3f093ac4c..1580747d6 100644 --- a/modules/remotebackend/test-remotebackend-post.cc +++ b/modules/remotebackend/test-remotebackend-post.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "pdns/namespaces.hh" #include "pdns/dns.hh" #include "pdns/dnsbackend.hh" diff --git a/modules/remotebackend/test-remotebackend-unix.cc b/modules/remotebackend/test-remotebackend-unix.cc index ab30b4fd3..b95dfce94 100644 --- a/modules/remotebackend/test-remotebackend-unix.cc +++ b/modules/remotebackend/test-remotebackend-unix.cc @@ -2,6 +2,9 @@ #define BOOST_TEST_MAIN #define BOOST_TEST_MODULE unit +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/modules/remotebackend/test-remotebackend-zeromq.cc b/modules/remotebackend/test-remotebackend-zeromq.cc index 00af000da..e7b2af4c5 100644 --- a/modules/remotebackend/test-remotebackend-zeromq.cc +++ b/modules/remotebackend/test-remotebackend-zeromq.cc @@ -2,6 +2,9 @@ #define BOOST_TEST_MAIN #define BOOST_TEST_MODULE unit +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/modules/remotebackend/test-remotebackend.cc b/modules/remotebackend/test-remotebackend.cc index 0d64dd51b..596135c31 100644 --- a/modules/remotebackend/test-remotebackend.cc +++ b/modules/remotebackend/test-remotebackend.cc @@ -1,6 +1,9 @@ #define BOOST_TEST_DYN_LINK #define BOOST_TEST_NO_MAIN +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/modules/remotebackend/unixconnector.cc b/modules/remotebackend/unixconnector.cc index 516e3b52d..ef2b40a81 100644 --- a/modules/remotebackend/unixconnector.cc +++ b/modules/remotebackend/unixconnector.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "remotebackend.hh" #include #include "pdns/lock.hh" diff --git a/modules/remotebackend/zmqconnector.cc b/modules/remotebackend/zmqconnector.cc index 8e427c49f..cd06baee8 100644 --- a/modules/remotebackend/zmqconnector.cc +++ b/modules/remotebackend/zmqconnector.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "remotebackend.hh" #ifdef REMOTEBACKEND_ZEROMQ diff --git a/modules/tinydnsbackend/cdb.cc b/modules/tinydnsbackend/cdb.cc index e67bea68b..12ab64892 100644 --- a/modules/tinydnsbackend/cdb.cc +++ b/modules/tinydnsbackend/cdb.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "cdb.hh" #include #include "pdns/misc.hh" diff --git a/modules/tinydnsbackend/tinydnsbackend.cc b/modules/tinydnsbackend/tinydnsbackend.cc index 74dae2da0..dede52893 100644 --- a/modules/tinydnsbackend/tinydnsbackend.cc +++ b/modules/tinydnsbackend/tinydnsbackend.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "tinydnsbackend.hh" #include "pdns/lock.hh" #include diff --git a/pdns/arguments.cc b/pdns/arguments.cc index 163537dbe..ff72d7caa 100644 --- a/pdns/arguments.cc +++ b/pdns/arguments.cc @@ -19,6 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "arguments.hh" #include #include diff --git a/pdns/auth-carbon.cc b/pdns/auth-carbon.cc index 1d9ebea71..c9aa54ad5 100644 --- a/pdns/auth-carbon.cc +++ b/pdns/auth-carbon.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "statbag.hh" #include "logger.hh" #include "iputils.hh" diff --git a/pdns/backends/gsql/gsqlbackend.cc b/pdns/backends/gsql/gsqlbackend.cc index fc8e2148e..fbe616eaf 100644 --- a/pdns/backends/gsql/gsqlbackend.cc +++ b/pdns/backends/gsql/gsqlbackend.cc @@ -20,6 +20,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "pdns/dns.hh" #include "pdns/dnsbackend.hh" #include "gsqlbackend.hh" diff --git a/pdns/base32.cc b/pdns/base32.cc index b76442a96..d88701579 100644 --- a/pdns/base32.cc +++ b/pdns/base32.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/base64.cc b/pdns/base64.cc index 87bebd857..68755733d 100644 --- a/pdns/base64.cc +++ b/pdns/base64.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "base64.hh" #include #include diff --git a/pdns/botan110signers.cc b/pdns/botan110signers.cc index 648d243f9..d3a829977 100644 --- a/pdns/botan110signers.cc +++ b/pdns/botan110signers.cc @@ -1,4 +1,7 @@ // utf-8 UTF-8 utf8 UTF8 +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/botan18signers.cc b/pdns/botan18signers.cc index 9cad576a7..af6a30d97 100644 --- a/pdns/botan18signers.cc +++ b/pdns/botan18signers.cc @@ -1,4 +1,7 @@ // utf-8 UTF-8 utf8 UTF8 +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/botansigners.cc b/pdns/botansigners.cc index bc1c4a727..282192232 100644 --- a/pdns/botansigners.cc +++ b/pdns/botansigners.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/calidns.cc b/pdns/calidns.cc index 4806340c6..25b10860c 100644 --- a/pdns/calidns.cc +++ b/pdns/calidns.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "dnsparser.hh" #include "sstuff.hh" diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc index edd9313ca..e14cf8bab 100644 --- a/pdns/common_startup.cc +++ b/pdns/common_startup.cc @@ -19,6 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "common_startup.hh" #include "ws-auth.hh" #include "secpoll-auth.hh" diff --git a/pdns/communicator.cc b/pdns/communicator.cc index ea22b1bac..46949793a 100644 --- a/pdns/communicator.cc +++ b/pdns/communicator.cc @@ -19,6 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "packetcache.hh" #include "utility.hh" #include diff --git a/pdns/cryptoppsigners.cc b/pdns/cryptoppsigners.cc index 2812dc88b..0c4a95d86 100644 --- a/pdns/cryptoppsigners.cc +++ b/pdns/cryptoppsigners.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/dbdnsseckeeper.cc b/pdns/dbdnsseckeeper.cc index 10e2e8ce9..781f956ca 100644 --- a/pdns/dbdnsseckeeper.cc +++ b/pdns/dbdnsseckeeper.cc @@ -20,6 +20,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "dnsseckeeper.hh" #include "dnssecinfra.hh" #include "ueberbackend.hh" diff --git a/pdns/devpollmplexer.cc b/pdns/devpollmplexer.cc index 984a0493e..53c39f30d 100644 --- a/pdns/devpollmplexer.cc +++ b/pdns/devpollmplexer.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "mplexer.hh" #include "sstuff.hh" diff --git a/pdns/dns.cc b/pdns/dns.cc index 1678f7072..1b5a9b264 100644 --- a/pdns/dns.cc +++ b/pdns/dns.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "dns.hh" #include "misc.hh" #include "arguments.hh" diff --git a/pdns/dns_random.cc b/pdns/dns_random.cc index 8944ba288..34a043ef0 100644 --- a/pdns/dns_random.cc +++ b/pdns/dns_random.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/dnsbackend.cc b/pdns/dnsbackend.cc index a861c99ea..5a935dfcc 100644 --- a/pdns/dnsbackend.cc +++ b/pdns/dnsbackend.cc @@ -19,6 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "utility.hh" #include "dnsbackend.hh" #include "arguments.hh" diff --git a/pdns/dnsbulktest.cc b/pdns/dnsbulktest.cc index 7673ee6cf..1f09d1b88 100644 --- a/pdns/dnsbulktest.cc +++ b/pdns/dnsbulktest.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/dnsdemog.cc b/pdns/dnsdemog.cc index 5518b96e6..bd3d1d2be 100644 --- a/pdns/dnsdemog.cc +++ b/pdns/dnsdemog.cc @@ -1,4 +1,7 @@ #define __FAVOR_BSD +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "statbag.hh" #include "dnspcap.hh" #include "dnsparser.hh" diff --git a/pdns/dnsdist.cc b/pdns/dnsdist.cc index c84e53b9a..defe00263 100644 --- a/pdns/dnsdist.cc +++ b/pdns/dnsdist.cc @@ -19,6 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "ext/luawrapper/include/LuaContext.hpp" #include "sstuff.hh" #include "misc.hh" diff --git a/pdns/dnsgram.cc b/pdns/dnsgram.cc index 80eaedbde..175951b80 100644 --- a/pdns/dnsgram.cc +++ b/pdns/dnsgram.cc @@ -1,4 +1,7 @@ #define __FAVOR_BSD +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "statbag.hh" #include "dnspcap.hh" #include "dnsrecords.hh" diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc index 82beddd47..1aa4532f7 100644 --- a/pdns/dnspacket.cc +++ b/pdns/dnspacket.cc @@ -20,6 +20,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "utility.hh" #include #include diff --git a/pdns/dnspacket.hh b/pdns/dnspacket.hh index 6a7f2bfe1..62405d880 100644 --- a/pdns/dnspacket.hh +++ b/pdns/dnspacket.hh @@ -55,9 +55,6 @@ #include "pdnsexception.hh" #include "dnsrecords.hh" -#ifdef HAVE_CONFIG_H -#include "config.h" - #endif // HAVE_CONFIG_H class UeberBackend; diff --git a/pdns/dnsparser.cc b/pdns/dnsparser.cc index e06eae340..e2f367a5a 100644 --- a/pdns/dnsparser.cc +++ b/pdns/dnsparser.cc @@ -20,6 +20,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "dnsparser.hh" #include "dnswriter.hh" #include diff --git a/pdns/dnspcap.cc b/pdns/dnspcap.cc index 7f4a9eeb6..5ca85d5ce 100644 --- a/pdns/dnspcap.cc +++ b/pdns/dnspcap.cc @@ -1,4 +1,7 @@ #define __FAVOR_BSD +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "dnspcap.hh" #include #include diff --git a/pdns/dnsproxy.cc b/pdns/dnsproxy.cc index dc324ce0b..d8ff5339f 100644 --- a/pdns/dnsproxy.cc +++ b/pdns/dnsproxy.cc @@ -19,6 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "packetcache.hh" #include "utility.hh" #include "dnsproxy.hh" diff --git a/pdns/dnsrecords.cc b/pdns/dnsrecords.cc index 6a0b24aa4..a94d02c82 100644 --- a/pdns/dnsrecords.cc +++ b/pdns/dnsrecords.cc @@ -20,6 +20,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "utility.hh" #include "dnsrecords.hh" #include diff --git a/pdns/dnsreplay.cc b/pdns/dnsreplay.cc index 9e8135617..8abe25cae 100644 --- a/pdns/dnsreplay.cc +++ b/pdns/dnsreplay.cc @@ -38,6 +38,9 @@ What to do with timeouts. We keep around at most 65536 outstanding answers. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "statbag.hh" #include "dnspcap.hh" diff --git a/pdns/dnsscan.cc b/pdns/dnsscan.cc index 8da65686d..d5aaccad0 100644 --- a/pdns/dnsscan.cc +++ b/pdns/dnsscan.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "statbag.hh" #include "dnspcap.hh" diff --git a/pdns/dnsscope.cc b/pdns/dnsscope.cc index 4b36701bb..d740b8ede 100644 --- a/pdns/dnsscope.cc +++ b/pdns/dnsscope.cc @@ -1,4 +1,7 @@ #define __FAVOR_BSD +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "statbag.hh" #include "dnspcap.hh" #include "dnsparser.hh" diff --git a/pdns/dnssecinfra.cc b/pdns/dnssecinfra.cc index 29ef7dcb9..82d69733f 100644 --- a/pdns/dnssecinfra.cc +++ b/pdns/dnssecinfra.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "dnsparser.hh" #include "sstuff.hh" #include "misc.hh" diff --git a/pdns/dnssecsigner.cc b/pdns/dnssecsigner.cc index 7813ccb97..14060ad89 100644 --- a/pdns/dnssecsigner.cc +++ b/pdns/dnssecsigner.cc @@ -19,6 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "dnssecinfra.hh" #include "namespaces.hh" #include diff --git a/pdns/dnstcpbench.cc b/pdns/dnstcpbench.cc index e7e5658ed..19fd8e244 100644 --- a/pdns/dnstcpbench.cc +++ b/pdns/dnstcpbench.cc @@ -19,6 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/dnswasher.cc b/pdns/dnswasher.cc index e992f770b..95bac8655 100644 --- a/pdns/dnswasher.cc +++ b/pdns/dnswasher.cc @@ -12,6 +12,9 @@ otherwise, obfuscate the response IP address */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "statbag.hh" #include "dnspcap.hh" diff --git a/pdns/dnswriter.cc b/pdns/dnswriter.cc index e38055ba5..68252f2c6 100644 --- a/pdns/dnswriter.cc +++ b/pdns/dnswriter.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "dnswriter.hh" #include "misc.hh" #include "dnsparser.hh" diff --git a/pdns/dumresp.cc b/pdns/dumresp.cc index 8739715a0..679dc1b95 100644 --- a/pdns/dumresp.cc +++ b/pdns/dumresp.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "iputils.hh" #include "sstuff.hh" #include "statbag.hh" diff --git a/pdns/dynhandler.cc b/pdns/dynhandler.cc index 51d52328d..de76b508d 100644 --- a/pdns/dynhandler.cc +++ b/pdns/dynhandler.cc @@ -19,6 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "packetcache.hh" #include "utility.hh" #include "dynhandler.hh" diff --git a/pdns/dynhandler.hh b/pdns/dynhandler.hh index 4573b09ac..4f112dec7 100644 --- a/pdns/dynhandler.hh +++ b/pdns/dynhandler.hh @@ -27,7 +27,6 @@ #include #include -#include "config.h" #include #include "namespaces.hh" diff --git a/pdns/dynlistener.cc b/pdns/dynlistener.cc index 5b3c8c126..d85359414 100644 --- a/pdns/dynlistener.cc +++ b/pdns/dynlistener.cc @@ -19,6 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/dynloader.cc b/pdns/dynloader.cc index bb2e4596c..5457b2a7e 100644 --- a/pdns/dynloader.cc +++ b/pdns/dynloader.cc @@ -19,6 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include @@ -38,7 +41,6 @@ #include "misc.hh" #include "dynmessenger.hh" #include "arguments.hh" -#include "config.h" #include "statbag.hh" #include "misc.hh" #include "namespaces.hh" diff --git a/pdns/dynmessenger.cc b/pdns/dynmessenger.cc index fb52ca5c3..001d7a4f2 100644 --- a/pdns/dynmessenger.cc +++ b/pdns/dynmessenger.cc @@ -19,6 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "dynmessenger.hh" #include #include diff --git a/pdns/ed25519signers.cc b/pdns/ed25519signers.cc index ed31dbcb6..176bbeb0e 100644 --- a/pdns/ed25519signers.cc +++ b/pdns/ed25519signers.cc @@ -1,5 +1,8 @@ // utf-8 UTF-8 utf8 UTF8 extern "C" { +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "ext/ed25519/crypto_sign.h" } #include "dnssecinfra.hh" diff --git a/pdns/ednssubnet.cc b/pdns/ednssubnet.cc index fafd9b92c..ed9084f2e 100644 --- a/pdns/ednssubnet.cc +++ b/pdns/ednssubnet.cc @@ -20,6 +20,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "ednssubnet.hh" #include "dns.hh" diff --git a/pdns/epollmplexer.cc b/pdns/epollmplexer.cc index dcb195fa4..c647ae990 100644 --- a/pdns/epollmplexer.cc +++ b/pdns/epollmplexer.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "mplexer.hh" #include "sstuff.hh" #include diff --git a/pdns/inflighter.cc b/pdns/inflighter.cc index f1698ba33..9729c9c1d 100644 --- a/pdns/inflighter.cc +++ b/pdns/inflighter.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/iputils.cc b/pdns/iputils.cc index 5ea22f979..2022db212 100644 --- a/pdns/iputils.cc +++ b/pdns/iputils.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "iputils.hh" #include diff --git a/pdns/json.cc b/pdns/json.cc index 8e24ca508..ac00f3a5c 100644 --- a/pdns/json.cc +++ b/pdns/json.cc @@ -19,6 +19,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "json.hh" #include "namespaces.hh" #include "misc.hh" diff --git a/pdns/kqueuemplexer.cc b/pdns/kqueuemplexer.cc index c07845731..6d469baae 100644 --- a/pdns/kqueuemplexer.cc +++ b/pdns/kqueuemplexer.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "mplexer.hh" #include "sstuff.hh" #include diff --git a/pdns/logger.cc b/pdns/logger.cc index 95019049b..220237242 100644 --- a/pdns/logger.cc +++ b/pdns/logger.cc @@ -19,8 +19,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "logger.hh" +#ifdef HAVE_CONFIG_H #include "config.h" +#endif +#include "logger.hh" #include "misc.hh" #ifndef RECURSOR #include "statbag.hh" diff --git a/pdns/logger.hh b/pdns/logger.hh index e1d1d826f..f74f4a1ac 100644 --- a/pdns/logger.hh +++ b/pdns/logger.hh @@ -27,7 +27,6 @@ #include #include #include -#include "config.h" #include #include diff --git a/pdns/lua-auth.cc b/pdns/lua-auth.cc index 6b6b6a472..f103f9e0a 100644 --- a/pdns/lua-auth.cc +++ b/pdns/lua-auth.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "lua-auth.hh" #if !defined(HAVE_LUA) diff --git a/pdns/lua-iputils.cc b/pdns/lua-iputils.cc index 965645902..95a98bba1 100644 --- a/pdns/lua-iputils.cc +++ b/pdns/lua-iputils.cc @@ -1,4 +1,6 @@ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #ifdef HAVE_LUA extern "C" { #include diff --git a/pdns/lua-pdns.cc b/pdns/lua-pdns.cc index c8bcefb02..7bc06467d 100644 --- a/pdns/lua-pdns.cc +++ b/pdns/lua-pdns.cc @@ -1,7 +1,9 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "lua-pdns.hh" // #include "syncres.hh" #include -#include "config.h" #if !defined(HAVE_LUA) diff --git a/pdns/lua-recursor.cc b/pdns/lua-recursor.cc index de402f49d..3ff659f79 100644 --- a/pdns/lua-recursor.cc +++ b/pdns/lua-recursor.cc @@ -1,5 +1,7 @@ -#include "lua-recursor.hh" +#ifdef HAVE_CONFIG_H #include "config.h" +#endif +#include "lua-recursor.hh" // to avoid including all of syncres.hh int directResolve(const std::string& qname, const QType& qtype, int qclass, vector& ret); diff --git a/pdns/lwres.cc b/pdns/lwres.cc index c60ed8a32..fe4eb9dea 100644 --- a/pdns/lwres.cc +++ b/pdns/lwres.cc @@ -21,6 +21,9 @@ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "utility.hh" #include "lwres.hh" #include diff --git a/pdns/mastercommunicator.cc b/pdns/mastercommunicator.cc index cb3a6770b..3c8012007 100644 --- a/pdns/mastercommunicator.cc +++ b/pdns/mastercommunicator.cc @@ -19,6 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "packetcache.hh" #include "utility.hh" #include diff --git a/pdns/misc.cc b/pdns/misc.cc index e155bc9bc..872a72237 100644 --- a/pdns/misc.cc +++ b/pdns/misc.cc @@ -20,6 +20,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/mtasker.cc b/pdns/mtasker.cc index 4ea777056..087dcbecb 100644 --- a/pdns/mtasker.cc +++ b/pdns/mtasker.cc @@ -20,6 +20,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "mtasker.hh" #include "misc.hh" #include diff --git a/pdns/nameserver.cc b/pdns/nameserver.cc index 4dc932332..37ed3c983 100644 --- a/pdns/nameserver.cc +++ b/pdns/nameserver.cc @@ -19,6 +19,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "utility.hh" #include #include diff --git a/pdns/notify.cc b/pdns/notify.cc index 6f1eaed5b..70f20f887 100644 --- a/pdns/notify.cc +++ b/pdns/notify.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "dnsparser.hh" #include "iputils.hh" diff --git a/pdns/nproxy.cc b/pdns/nproxy.cc index 44b916e43..7237a16b3 100644 --- a/pdns/nproxy.cc +++ b/pdns/nproxy.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "dnsparser.hh" #include "iputils.hh" diff --git a/pdns/nsec3dig.cc b/pdns/nsec3dig.cc index 5cee2908d..d3bcdaa4f 100644 --- a/pdns/nsec3dig.cc +++ b/pdns/nsec3dig.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "dnsparser.hh" #include "sstuff.hh" #include "misc.hh" diff --git a/pdns/nsecrecords.cc b/pdns/nsecrecords.cc index 15b2efa2a..9dc4994e3 100644 --- a/pdns/nsecrecords.cc +++ b/pdns/nsecrecords.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "dnsrecords.hh" void NSECRecordContent::report(void) diff --git a/pdns/packetcache.cc b/pdns/packetcache.cc index 5c7f013d0..4ef5d2621 100644 --- a/pdns/packetcache.cc +++ b/pdns/packetcache.cc @@ -19,6 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "utility.hh" #include "packetcache.hh" #include "logger.hh" diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc index c727c3199..ef5599d41 100644 --- a/pdns/packethandler.cc +++ b/pdns/packethandler.cc @@ -19,6 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "packetcache.hh" #include "utility.hh" #include "base32.hh" diff --git a/pdns/pdns_hw.cc b/pdns/pdns_hw.cc index 88299707b..b0f13cc5e 100644 --- a/pdns/pdns_hw.cc +++ b/pdns/pdns_hw.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc index 4ffbd1610..df4276cf2 100644 --- a/pdns/pdns_recursor.cc +++ b/pdns/pdns_recursor.cc @@ -20,6 +20,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc index 851610589..bac88672e 100644 --- a/pdns/pdnssec.cc +++ b/pdns/pdnssec.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "dnsseckeeper.hh" #include "dnssecinfra.hh" #include "statbag.hh" diff --git a/pdns/pkcs11signers.cc b/pdns/pkcs11signers.cc index 6dd3c669f..c703b2e5e 100644 --- a/pdns/pkcs11signers.cc +++ b/pdns/pkcs11signers.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/polarrsakeyinfra.cc b/pdns/polarrsakeyinfra.cc index 5bdee4d5b..bba019396 100644 --- a/pdns/polarrsakeyinfra.cc +++ b/pdns/polarrsakeyinfra.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/pollmplexer.cc b/pdns/pollmplexer.cc index 4e6fd49ad..5b38341bb 100644 --- a/pdns/pollmplexer.cc +++ b/pdns/pollmplexer.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "mplexer.hh" #include "sstuff.hh" #include diff --git a/pdns/portsmplexer.cc b/pdns/portsmplexer.cc index db032e995..03ad0ed0d 100644 --- a/pdns/portsmplexer.cc +++ b/pdns/portsmplexer.cc @@ -1,4 +1,7 @@ #if defined(__sun__) && defined(__svr4__) +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #endif diff --git a/pdns/qtype.cc b/pdns/qtype.cc index ed7bf4fd0..c53db7dd5 100644 --- a/pdns/qtype.cc +++ b/pdns/qtype.cc @@ -19,6 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "utility.hh" #include "dns.hh" #include diff --git a/pdns/randomhelper.cc b/pdns/randomhelper.cc index 89c1f6643..9ea1b22c1 100644 --- a/pdns/randomhelper.cc +++ b/pdns/randomhelper.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "misc.hh" #include "logger.hh" #include diff --git a/pdns/rcpgenerator.cc b/pdns/rcpgenerator.cc index a3b4354bc..7a0111e17 100644 --- a/pdns/rcpgenerator.cc +++ b/pdns/rcpgenerator.cc @@ -20,6 +20,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "rcpgenerator.hh" #include "dnsparser.hh" #include "misc.hh" diff --git a/pdns/rec-carbon.cc b/pdns/rec-carbon.cc index 69d01120a..d27a7c2a3 100644 --- a/pdns/rec-carbon.cc +++ b/pdns/rec-carbon.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "mtasker.hh" #include "syncres.hh" #include "rec_channel.hh" diff --git a/pdns/rec_channel.cc b/pdns/rec_channel.cc index d566c06a7..77a5d68ba 100644 --- a/pdns/rec_channel.cc +++ b/pdns/rec_channel.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "rec_channel.hh" #include #include diff --git a/pdns/rec_channel_rec.cc b/pdns/rec_channel_rec.cc index 4c0dc19a7..44bca9b2c 100644 --- a/pdns/rec_channel_rec.cc +++ b/pdns/rec_channel_rec.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "utility.hh" #include "rec_channel.hh" #include diff --git a/pdns/rec_control.cc b/pdns/rec_control.cc index fb30046d9..eb45651e1 100644 --- a/pdns/rec_control.cc +++ b/pdns/rec_control.cc @@ -19,11 +19,13 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "rec_channel.hh" #include #include "pdnsexception.hh" #include "arguments.hh" -#include "config.h" #include "namespaces.hh" diff --git a/pdns/receiver.cc b/pdns/receiver.cc index 3925f95e8..7df07ca2c 100644 --- a/pdns/receiver.cc +++ b/pdns/receiver.cc @@ -19,6 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "packetcache.hh" #include @@ -44,7 +47,6 @@ #include #include -#include "config.h" #include "dns.hh" #include "dnsbackend.hh" #include "ueberbackend.hh" diff --git a/pdns/recpacketcache.cc b/pdns/recpacketcache.cc index c9e89d12b..f22a4c663 100644 --- a/pdns/recpacketcache.cc +++ b/pdns/recpacketcache.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include "recpacketcache.hh" diff --git a/pdns/recursor_cache.cc b/pdns/recursor_cache.cc index dda3f4266..8b1a17385 100644 --- a/pdns/recursor_cache.cc +++ b/pdns/recursor_cache.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "recursor_cache.hh" #include "misc.hh" #include @@ -11,7 +14,6 @@ #include "namespaces.hh" #include "namespaces.hh" -#include "config.h" DNSResourceRecord String2DNSRR(const string& qname, const QType& qt, const string& serial, uint32_t ttd) { diff --git a/pdns/reczones.cc b/pdns/reczones.cc index acf09ce91..a6e329144 100644 --- a/pdns/reczones.cc +++ b/pdns/reczones.cc @@ -20,6 +20,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "syncres.hh" #include "arguments.hh" #include "zoneparser-tng.hh" diff --git a/pdns/resolver.cc b/pdns/resolver.cc index cd207248c..cc0fd05d1 100644 --- a/pdns/resolver.cc +++ b/pdns/resolver.cc @@ -19,6 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "packetcache.hh" #include "utility.hh" #include "resolver.hh" diff --git a/pdns/responsestats.cc b/pdns/responsestats.cc index bbaaed087..ff4168da3 100644 --- a/pdns/responsestats.cc +++ b/pdns/responsestats.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "responsestats.hh" #include #include "namespaces.hh" diff --git a/pdns/rfc2136handler.cc b/pdns/rfc2136handler.cc index a90a7ed15..4b254378e 100644 --- a/pdns/rfc2136handler.cc +++ b/pdns/rfc2136handler.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "packethandler.hh" #include "qtype.hh" #include "dnspacket.hh" diff --git a/pdns/saxfr.cc b/pdns/saxfr.cc index 290c362e4..b2fbf8925 100644 --- a/pdns/saxfr.cc +++ b/pdns/saxfr.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "dnsparser.hh" #include "sstuff.hh" #include "misc.hh" diff --git a/pdns/sdig.cc b/pdns/sdig.cc index e4e9e9c75..5cc0d3134 100644 --- a/pdns/sdig.cc +++ b/pdns/sdig.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "dnsparser.hh" #include "sstuff.hh" #include "misc.hh" diff --git a/pdns/secpoll-auth.cc b/pdns/secpoll-auth.cc index cf9cc8ff5..06a645396 100644 --- a/pdns/secpoll-auth.cc +++ b/pdns/secpoll-auth.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "secpoll-auth.hh" #include "logger.hh" diff --git a/pdns/secpoll-recursor.cc b/pdns/secpoll-recursor.cc index ffd227b7f..c44d665fd 100644 --- a/pdns/secpoll-recursor.cc +++ b/pdns/secpoll-recursor.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "secpoll-recursor.hh" #include "syncres.hh" #include "logger.hh" diff --git a/pdns/selectmplexer.cc b/pdns/selectmplexer.cc index 99f191ef7..bb20b095e 100644 --- a/pdns/selectmplexer.cc +++ b/pdns/selectmplexer.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "mplexer.hh" #include "sstuff.hh" #include diff --git a/pdns/serialtweaker.cc b/pdns/serialtweaker.cc index e502bf045..c6c4a1775 100644 --- a/pdns/serialtweaker.cc +++ b/pdns/serialtweaker.cc @@ -20,6 +20,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "dnsseckeeper.hh" #include "dnspacket.hh" #include "namespaces.hh" diff --git a/pdns/signingpipe.cc b/pdns/signingpipe.cc index 3b21b97b9..9feb08e90 100644 --- a/pdns/signingpipe.cc +++ b/pdns/signingpipe.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "signingpipe.hh" #include "misc.hh" #include diff --git a/pdns/sillyrecords.cc b/pdns/sillyrecords.cc index 6553ec65a..0009dea9c 100644 --- a/pdns/sillyrecords.cc +++ b/pdns/sillyrecords.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "utility.hh" #include #include diff --git a/pdns/slavecommunicator.cc b/pdns/slavecommunicator.cc index e28513da5..9c3fb69f1 100644 --- a/pdns/slavecommunicator.cc +++ b/pdns/slavecommunicator.cc @@ -19,6 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "packetcache.hh" #include "utility.hh" #include "dnssecinfra.hh" diff --git a/pdns/speedtest.cc b/pdns/speedtest.cc index 3a7f1c9ee..8176f50b2 100644 --- a/pdns/speedtest.cc +++ b/pdns/speedtest.cc @@ -1,10 +1,10 @@ +#include "config.h" #include "dnsparser.hh" #include "sstuff.hh" #include "misc.hh" #include "dnswriter.hh" #include "dnsrecords.hh" #include -#include "config.h" #ifndef RECURSOR #include "statbag.hh" #include "base64.hh" diff --git a/pdns/ssqlite3.cc b/pdns/ssqlite3.cc index 618c3f8a7..c910e04d2 100644 --- a/pdns/ssqlite3.cc +++ b/pdns/ssqlite3.cc @@ -4,6 +4,9 @@ // Copyright (C) 2003, Michel Stol // +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include "ssqlite3.hh" diff --git a/pdns/statbag.cc b/pdns/statbag.cc index 188e71b3a..8799c7ff0 100644 --- a/pdns/statbag.cc +++ b/pdns/statbag.cc @@ -20,6 +20,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "utility.hh" #include "statbag.hh" #include "pdnsexception.hh" diff --git a/pdns/syncres.cc b/pdns/syncres.cc index 8a478ae9c..25083d407 100644 --- a/pdns/syncres.cc +++ b/pdns/syncres.cc @@ -20,6 +20,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include "lua-recursor.hh" diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc index 675e21ff3..de2e8c128 100644 --- a/pdns/tcpreceiver.cc +++ b/pdns/tcpreceiver.cc @@ -19,6 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "packetcache.hh" #include "utility.hh" #include "dnssecinfra.hh" diff --git a/pdns/test-base32_cc.cc b/pdns/test-base32_cc.cc index e192b3237..24be0ca44 100644 --- a/pdns/test-base32_cc.cc +++ b/pdns/test-base32_cc.cc @@ -1,5 +1,8 @@ #define BOOST_TEST_DYN_LINK #define BOOST_TEST_NO_MAIN +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/test-base64_cc.cc b/pdns/test-base64_cc.cc index bc9a3cb68..60a915f07 100644 --- a/pdns/test-base64_cc.cc +++ b/pdns/test-base64_cc.cc @@ -1,5 +1,8 @@ #define BOOST_TEST_DYN_LINK #define BOOST_TEST_NO_MAIN +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/test-bindparser_cc.cc b/pdns/test-bindparser_cc.cc index b3eb768a1..6a6470fd3 100644 --- a/pdns/test-bindparser_cc.cc +++ b/pdns/test-bindparser_cc.cc @@ -1,6 +1,9 @@ #define BOOST_TEST_DYN_LINK #define BOOST_TEST_NO_MAIN +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "bindparserclasses.hh" #include "misc.hh" diff --git a/pdns/test-dns_random_hh.cc b/pdns/test-dns_random_hh.cc index 7c839b341..5e9eb4df3 100644 --- a/pdns/test-dns_random_hh.cc +++ b/pdns/test-dns_random_hh.cc @@ -1,5 +1,8 @@ #define BOOST_TEST_DYN_LINK #define BOOST_TEST_NO_MAIN +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/test-dnsrecords_cc.cc b/pdns/test-dnsrecords_cc.cc index 341e6297b..a16e70339 100644 --- a/pdns/test-dnsrecords_cc.cc +++ b/pdns/test-dnsrecords_cc.cc @@ -1,5 +1,8 @@ #define BOOST_TEST_DYN_LINK #define BOOST_TEST_NO_MAIN +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/test-iputils_hh.cc b/pdns/test-iputils_hh.cc index 43a0b67d5..ea6523a03 100644 --- a/pdns/test-iputils_hh.cc +++ b/pdns/test-iputils_hh.cc @@ -1,5 +1,8 @@ #define BOOST_TEST_DYN_LINK #define BOOST_TEST_NO_MAIN +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "iputils.hh" diff --git a/pdns/test-md5_hh.cc b/pdns/test-md5_hh.cc index 132ff44b2..267b56a49 100644 --- a/pdns/test-md5_hh.cc +++ b/pdns/test-md5_hh.cc @@ -1,5 +1,8 @@ #define BOOST_TEST_DYN_LINK #define BOOST_TEST_NO_MAIN +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/test-misc_hh.cc b/pdns/test-misc_hh.cc index 8732264f3..7f4b2c85d 100644 --- a/pdns/test-misc_hh.cc +++ b/pdns/test-misc_hh.cc @@ -1,6 +1,9 @@ #define BOOST_TEST_DYN_LINK #define BOOST_TEST_NO_MAIN +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/test-nameserver_cc.cc b/pdns/test-nameserver_cc.cc index 8417b5532..7ab8a6805 100644 --- a/pdns/test-nameserver_cc.cc +++ b/pdns/test-nameserver_cc.cc @@ -1,6 +1,9 @@ #define BOOST_TEST_DYN_LINK #define BOOST_TEST_NO_MAIN +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "iputils.hh" #include "nameserver.hh" diff --git a/pdns/test-packetcache_cc.cc b/pdns/test-packetcache_cc.cc index 9121014eb..fd1144d1e 100644 --- a/pdns/test-packetcache_cc.cc +++ b/pdns/test-packetcache_cc.cc @@ -1,6 +1,9 @@ #define BOOST_TEST_DYN_LINK #define BOOST_TEST_NO_MAIN +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include "iputils.hh" diff --git a/pdns/test-rcpgenerator_cc.cc b/pdns/test-rcpgenerator_cc.cc index 96e150e89..42bcfe2be 100644 --- a/pdns/test-rcpgenerator_cc.cc +++ b/pdns/test-rcpgenerator_cc.cc @@ -1,6 +1,9 @@ #define BOOST_TEST_DYN_LINK #define BOOST_TEST_NO_MAIN +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "rcpgenerator.hh" #include "misc.hh" diff --git a/pdns/test-sha_hh.cc b/pdns/test-sha_hh.cc index 40af08c0b..9ff1bb07d 100644 --- a/pdns/test-sha_hh.cc +++ b/pdns/test-sha_hh.cc @@ -1,5 +1,8 @@ #define BOOST_TEST_DYN_LINK #define BOOST_TEST_NO_MAIN +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/test-statbag_cc.cc b/pdns/test-statbag_cc.cc index 48b82ea5b..e4d69fc34 100644 --- a/pdns/test-statbag_cc.cc +++ b/pdns/test-statbag_cc.cc @@ -1,6 +1,9 @@ #define BOOST_TEST_DYN_LINK #define BOOST_TEST_NO_MAIN +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/test-zoneparser_tng_cc.cc b/pdns/test-zoneparser_tng_cc.cc index 506fcdff3..de673f0a9 100644 --- a/pdns/test-zoneparser_tng_cc.cc +++ b/pdns/test-zoneparser_tng_cc.cc @@ -1,5 +1,8 @@ #define BOOST_TEST_DYN_LINK #define BOOST_TEST_NO_MAIN +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/testrunner.cc b/pdns/testrunner.cc index 15a9d43aa..68cbdcaf0 100644 --- a/pdns/testrunner.cc +++ b/pdns/testrunner.cc @@ -2,6 +2,9 @@ #define BOOST_TEST_MAIN #define BOOST_TEST_MODULE unit +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "packetcache.hh" StatBag S; PacketCache PC; diff --git a/pdns/toysdig.cc b/pdns/toysdig.cc index 707007c05..da63fa2f8 100644 --- a/pdns/toysdig.cc +++ b/pdns/toysdig.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "dnsparser.hh" #include "sstuff.hh" #include "misc.hh" diff --git a/pdns/tsig-tests.cc b/pdns/tsig-tests.cc index 34d85d314..ecf52836c 100644 --- a/pdns/tsig-tests.cc +++ b/pdns/tsig-tests.cc @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "dnsparser.hh" #include "dnswriter.hh" #include "sstuff.hh" diff --git a/pdns/ueberbackend.cc b/pdns/ueberbackend.cc index 8117370b1..629cbdbd0 100644 --- a/pdns/ueberbackend.cc +++ b/pdns/ueberbackend.cc @@ -19,15 +19,15 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include "packetcache.hh" #include "utility.hh" -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif // HAVE_CONFIG_H #include #include diff --git a/pdns/unix_semaphore.cc b/pdns/unix_semaphore.cc index 7064bc98d..45e9339bf 100644 --- a/pdns/unix_semaphore.cc +++ b/pdns/unix_semaphore.cc @@ -21,6 +21,9 @@ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "utility.hh" #include #include diff --git a/pdns/unix_utility.cc b/pdns/unix_utility.cc index 673e9098f..562e718b0 100644 --- a/pdns/unix_utility.cc +++ b/pdns/unix_utility.cc @@ -20,6 +20,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "utility.hh" #include #include diff --git a/pdns/version.cc b/pdns/version.cc index 1b33d595c..0c04e5e09 100644 --- a/pdns/version.cc +++ b/pdns/version.cc @@ -20,6 +20,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "logger.hh" #include "version.hh" #include "version_generated.h" diff --git a/pdns/webserver.cc b/pdns/webserver.cc index 308da1394..48c1eb0a6 100644 --- a/pdns/webserver.cc +++ b/pdns/webserver.cc @@ -19,6 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "utility.hh" #include "webserver.hh" #include "misc.hh" diff --git a/pdns/ws-api.cc b/pdns/ws-api.cc index faae37af0..41389f366 100644 --- a/pdns/ws-api.cc +++ b/pdns/ws-api.cc @@ -18,13 +18,15 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include #include "namespaces.hh" #include "ws-api.hh" #include "json.hh" -#include "config.h" #include "version.hh" #include "arguments.hh" #include diff --git a/pdns/ws-auth.cc b/pdns/ws-auth.cc index b07d2a98f..5214619dc 100644 --- a/pdns/ws-auth.cc +++ b/pdns/ws-auth.cc @@ -18,6 +18,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "utility.hh" #include "dynlistener.hh" #include "ws-auth.hh" @@ -44,9 +47,6 @@ #include "zoneparser-tng.hh" #include "common_startup.hh" -#ifdef HAVE_CONFIG_H -# include -#endif // HAVE_CONFIG_H using namespace rapidjson; diff --git a/pdns/ws-recursor.cc b/pdns/ws-recursor.cc index 05ddb694a..15dbac9a4 100644 --- a/pdns/ws-recursor.cc +++ b/pdns/ws-recursor.cc @@ -19,6 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "ws-recursor.hh" #include "json.hh" #include diff --git a/pdns/zone2json.cc b/pdns/zone2json.cc index 6141215b8..cc883d3de 100644 --- a/pdns/zone2json.cc +++ b/pdns/zone2json.cc @@ -21,6 +21,9 @@ */ /* accepts a named.conf or a zone as parameter and outputs heaps of sql */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/zone2ldap.cc b/pdns/zone2ldap.cc index 4dd7e9f24..c81f25499 100644 --- a/pdns/zone2ldap.cc +++ b/pdns/zone2ldap.cc @@ -19,6 +19,9 @@ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/zone2lmdb.cc b/pdns/zone2lmdb.cc index 5693fbae1..36279b346 100644 --- a/pdns/zone2lmdb.cc +++ b/pdns/zone2lmdb.cc @@ -20,6 +20,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/zone2sql.cc b/pdns/zone2sql.cc index 317fd8bfb..a2a0e8803 100644 --- a/pdns/zone2sql.cc +++ b/pdns/zone2sql.cc @@ -21,6 +21,9 @@ */ /* accepts a named.conf or a zone as parameter and outputs heaps of sql */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/pdns/zoneparser-tng.cc b/pdns/zoneparser-tng.cc index 4dd41b69e..a6c90b63a 100644 --- a/pdns/zoneparser-tng.cc +++ b/pdns/zoneparser-tng.cc @@ -20,6 +20,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "dnsparser.hh" #include "sstuff.hh" #include "misc.hh" -- 2.49.0