From 96349507dfae9440bf97adb3f36fd07b726621e6 Mon Sep 17 00:00:00 2001 From: Christian Hofstaedtler Date: Sat, 14 Jan 2017 13:02:20 +0100 Subject: [PATCH] Remove spurious ueberbackend.hh includes from backends --- modules/gmysqlbackend/gmysqlbackend.cc | 1 - modules/godbcbackend/godbcbackend.cc | 1 - modules/goraclebackend/goraclebackend.cc | 1 - modules/gpgsqlbackend/gpgsqlbackend.cc | 1 - modules/gsqlite3backend/gsqlite3backend.cc | 1 - modules/ldapbackend/ldapbackend.hh | 1 - modules/mydnsbackend/mydnsbackend.cc | 1 - modules/opendbxbackend/odbxbackend.hh | 1 - modules/pipebackend/pipebackend.cc | 1 - modules/remotebackend/remotebackend.hh | 1 - modules/remotebackend/test-remotebackend-http.cc | 1 - modules/remotebackend/test-remotebackend-json.cc | 1 - modules/remotebackend/test-remotebackend-pipe.cc | 1 - modules/remotebackend/test-remotebackend-post.cc | 1 - modules/remotebackend/test-remotebackend-unix.cc | 1 - modules/remotebackend/test-remotebackend-zeromq.cc | 1 - modules/remotebackend/test-remotebackend.cc | 1 - modules/remotebackend/unixconnector.cc | 3 +++ pdns/backends/gsql/gsqlbackend.cc | 1 - pdns/ueberbackend.cc | 1 + pdns/ueberbackend.hh | 4 ---- 21 files changed, 4 insertions(+), 22 deletions(-) diff --git a/modules/gmysqlbackend/gmysqlbackend.cc b/modules/gmysqlbackend/gmysqlbackend.cc index 1be4e1e5da..be7dd3e64b 100644 --- a/modules/gmysqlbackend/gmysqlbackend.cc +++ b/modules/gmysqlbackend/gmysqlbackend.cc @@ -29,7 +29,6 @@ #include "pdns/dns.hh" #include "pdns/dnsbackend.hh" #include "pdns/dnspacket.hh" -#include "pdns/ueberbackend.hh" #include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include "pdns/arguments.hh" diff --git a/modules/godbcbackend/godbcbackend.cc b/modules/godbcbackend/godbcbackend.cc index 206eed91ea..0f4e9aad99 100644 --- a/modules/godbcbackend/godbcbackend.cc +++ b/modules/godbcbackend/godbcbackend.cc @@ -27,7 +27,6 @@ #include "pdns/dns.hh" #include "pdns/dnsbackend.hh" #include "pdns/dnspacket.hh" -#include "pdns/ueberbackend.hh" #include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include "pdns/arguments.hh" diff --git a/modules/goraclebackend/goraclebackend.cc b/modules/goraclebackend/goraclebackend.cc index 498679d099..f3a2bdf998 100644 --- a/modules/goraclebackend/goraclebackend.cc +++ b/modules/goraclebackend/goraclebackend.cc @@ -28,7 +28,6 @@ #include "pdns/dns.hh" #include "pdns/dnsbackend.hh" #include "pdns/dnspacket.hh" -#include "pdns/ueberbackend.hh" #include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include "pdns/arguments.hh" diff --git a/modules/gpgsqlbackend/gpgsqlbackend.cc b/modules/gpgsqlbackend/gpgsqlbackend.cc index e540de3227..124c10f131 100644 --- a/modules/gpgsqlbackend/gpgsqlbackend.cc +++ b/modules/gpgsqlbackend/gpgsqlbackend.cc @@ -28,7 +28,6 @@ #include "pdns/dns.hh" #include "pdns/dnsbackend.hh" #include "pdns/dnspacket.hh" -#include "pdns/ueberbackend.hh" #include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include "pdns/arguments.hh" diff --git a/modules/gsqlite3backend/gsqlite3backend.cc b/modules/gsqlite3backend/gsqlite3backend.cc index 298d40e53d..dd1bdc8ca4 100644 --- a/modules/gsqlite3backend/gsqlite3backend.cc +++ b/modules/gsqlite3backend/gsqlite3backend.cc @@ -31,7 +31,6 @@ #include "pdns/dns.hh" #include "pdns/dnsbackend.hh" #include "pdns/dnspacket.hh" -#include "pdns/ueberbackend.hh" #include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include "pdns/arguments.hh" diff --git a/modules/ldapbackend/ldapbackend.hh b/modules/ldapbackend/ldapbackend.hh index d2fb3bb4cc..48ecee562d 100644 --- a/modules/ldapbackend/ldapbackend.hh +++ b/modules/ldapbackend/ldapbackend.hh @@ -31,7 +31,6 @@ #include "pdns/utility.hh" #include "pdns/dnspacket.hh" #include "pdns/dnsbackend.hh" -#include "pdns/ueberbackend.hh" #include "pdns/pdnsexception.hh" #include "pdns/arguments.hh" #include "pdns/logger.hh" diff --git a/modules/mydnsbackend/mydnsbackend.cc b/modules/mydnsbackend/mydnsbackend.cc index 71bb6be487..8a2cf7c987 100644 --- a/modules/mydnsbackend/mydnsbackend.cc +++ b/modules/mydnsbackend/mydnsbackend.cc @@ -54,7 +54,6 @@ #include "pdns/dnsbackend.hh" #include "mydnsbackend.hh" #include "pdns/dnspacket.hh" -#include "pdns/ueberbackend.hh" #include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include "pdns/arguments.hh" diff --git a/modules/opendbxbackend/odbxbackend.hh b/modules/opendbxbackend/odbxbackend.hh index 81e2703481..42a4cd638a 100644 --- a/modules/opendbxbackend/odbxbackend.hh +++ b/modules/opendbxbackend/odbxbackend.hh @@ -28,7 +28,6 @@ #include "pdns/utility.hh" #include "pdns/dnspacket.hh" #include "pdns/dnsbackend.hh" -#include "pdns/ueberbackend.hh" #include "pdns/pdnsexception.hh" #include "pdns/arguments.hh" #include "pdns/logger.hh" diff --git a/modules/pipebackend/pipebackend.cc b/modules/pipebackend/pipebackend.cc index 03e2a6c918..1def45c21c 100644 --- a/modules/pipebackend/pipebackend.cc +++ b/modules/pipebackend/pipebackend.cc @@ -34,7 +34,6 @@ #include "pdns/dns.hh" #include "pdns/dnsbackend.hh" #include "pdns/dnspacket.hh" -#include "pdns/ueberbackend.hh" #include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include "pdns/arguments.hh" diff --git a/modules/remotebackend/remotebackend.hh b/modules/remotebackend/remotebackend.hh index 412af64541..52813c1133 100644 --- a/modules/remotebackend/remotebackend.hh +++ b/modules/remotebackend/remotebackend.hh @@ -33,7 +33,6 @@ #include "pdns/namespaces.hh" #include "pdns/pdnsexception.hh" #include "pdns/sstuff.hh" -#include "pdns/ueberbackend.hh" #include "pdns/json.hh" #include "pdns/lock.hh" #include "yahttp/yahttp.hpp" diff --git a/modules/remotebackend/test-remotebackend-http.cc b/modules/remotebackend/test-remotebackend-http.cc index b14a66454c..97fa3c141a 100644 --- a/modules/remotebackend/test-remotebackend-http.cc +++ b/modules/remotebackend/test-remotebackend-http.cc @@ -27,7 +27,6 @@ #include "pdns/dns.hh" #include "pdns/dnsbackend.hh" #include "pdns/dnspacket.hh" -#include "pdns/ueberbackend.hh" #include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include "pdns/arguments.hh" diff --git a/modules/remotebackend/test-remotebackend-json.cc b/modules/remotebackend/test-remotebackend-json.cc index e24aa8ecfd..1e341fb0e0 100644 --- a/modules/remotebackend/test-remotebackend-json.cc +++ b/modules/remotebackend/test-remotebackend-json.cc @@ -26,7 +26,6 @@ #include "pdns/dns.hh" #include "pdns/dnsbackend.hh" #include "pdns/dnspacket.hh" -#include "pdns/ueberbackend.hh" #include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include "pdns/arguments.hh" diff --git a/modules/remotebackend/test-remotebackend-pipe.cc b/modules/remotebackend/test-remotebackend-pipe.cc index 9ac093f9b3..80876d2376 100644 --- a/modules/remotebackend/test-remotebackend-pipe.cc +++ b/modules/remotebackend/test-remotebackend-pipe.cc @@ -34,7 +34,6 @@ #include "pdns/dns.hh" #include "pdns/dnsbackend.hh" #include "pdns/dnspacket.hh" -#include "pdns/ueberbackend.hh" #include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include "pdns/arguments.hh" diff --git a/modules/remotebackend/test-remotebackend-post.cc b/modules/remotebackend/test-remotebackend-post.cc index 669a612430..a3858317ed 100644 --- a/modules/remotebackend/test-remotebackend-post.cc +++ b/modules/remotebackend/test-remotebackend-post.cc @@ -26,7 +26,6 @@ #include "pdns/dns.hh" #include "pdns/dnsbackend.hh" #include "pdns/dnspacket.hh" -#include "pdns/ueberbackend.hh" #include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include "pdns/arguments.hh" diff --git a/modules/remotebackend/test-remotebackend-unix.cc b/modules/remotebackend/test-remotebackend-unix.cc index 2d3200bd4a..b9fd94abe0 100644 --- a/modules/remotebackend/test-remotebackend-unix.cc +++ b/modules/remotebackend/test-remotebackend-unix.cc @@ -34,7 +34,6 @@ #include "pdns/dns.hh" #include "pdns/dnsbackend.hh" #include "pdns/dnspacket.hh" -#include "pdns/ueberbackend.hh" #include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include "pdns/arguments.hh" diff --git a/modules/remotebackend/test-remotebackend-zeromq.cc b/modules/remotebackend/test-remotebackend-zeromq.cc index 164b588a88..7015c04c31 100644 --- a/modules/remotebackend/test-remotebackend-zeromq.cc +++ b/modules/remotebackend/test-remotebackend-zeromq.cc @@ -33,7 +33,6 @@ #include "pdns/dns.hh" #include "pdns/dnsbackend.hh" #include "pdns/dnspacket.hh" -#include "pdns/ueberbackend.hh" #include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include "pdns/arguments.hh" diff --git a/modules/remotebackend/test-remotebackend.cc b/modules/remotebackend/test-remotebackend.cc index ddadf44efc..96596cc5b3 100644 --- a/modules/remotebackend/test-remotebackend.cc +++ b/modules/remotebackend/test-remotebackend.cc @@ -33,7 +33,6 @@ #include "pdns/dns.hh" #include "pdns/dnsbackend.hh" #include "pdns/dnspacket.hh" -#include "pdns/ueberbackend.hh" #include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include "pdns/arguments.hh" diff --git a/modules/remotebackend/unixconnector.cc b/modules/remotebackend/unixconnector.cc index e657984cd9..a9ce1b67f4 100644 --- a/modules/remotebackend/unixconnector.cc +++ b/modules/remotebackend/unixconnector.cc @@ -22,6 +22,9 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif +#include +#include +#include #include "remotebackend.hh" #ifndef UNIX_PATH_MAX #define UNIX_PATH_MAX 108 diff --git a/pdns/backends/gsql/gsqlbackend.cc b/pdns/backends/gsql/gsqlbackend.cc index 38294fb07e..de466acddf 100644 --- a/pdns/backends/gsql/gsqlbackend.cc +++ b/pdns/backends/gsql/gsqlbackend.cc @@ -26,7 +26,6 @@ #include "pdns/dnsbackend.hh" #include "gsqlbackend.hh" #include "pdns/dnspacket.hh" -#include "pdns/ueberbackend.hh" #include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include "pdns/arguments.hh" diff --git a/pdns/ueberbackend.cc b/pdns/ueberbackend.cc index e0383c946b..2aa71bb787 100644 --- a/pdns/ueberbackend.cc +++ b/pdns/ueberbackend.cc @@ -29,6 +29,7 @@ #include "utility.hh" +#include #include #include #include diff --git a/pdns/ueberbackend.hh b/pdns/ueberbackend.hh index 51810278d2..8da73d5a24 100644 --- a/pdns/ueberbackend.hh +++ b/pdns/ueberbackend.hh @@ -29,11 +29,7 @@ #include #include -#include -#include #include -#include -#include #include #include #include -- 2.47.2