Merge pull request #2019 from rubenk/add-missing-include-guards

Add missing include guards

diff --cc modules/bindbackend/bindbackend2.hh
index 2bbc0420948d9b519a0acb0b18f33d97fdca0d10,0eb31104fed36367e51ec7e497b1f94bcba1cf47..32ff0cc9c38eec7fd71bdadffbf75e5a64420534
--- 1/modules/bindbackend/bindbackend2.hh
--- 2/modules/bindbackend/bindbackend2.hh
+++ b/modules/bindbackend/bindbackend2.hh
@@@ -305,18 -304,6 +308,20 @@@ private
    void doEmptyNonTerminals(BB2DomainInfo& bbd, bool nsec3zone, NSEC3PARAMRecordContent ns3pr);
    void loadConfig(string *status=0);
    static void nukeZoneRecords(BB2DomainInfo *bbd);
 +
 +  SSqlStatement* d_getAllDomainMetadataQuery_stmt;
 +  SSqlStatement* d_getDomainMetadataQuery_stmt;
 +  SSqlStatement* d_deleteDomainMetadataQuery_stmt;
 +  SSqlStatement* d_insertDomainMetadataQuery_stmt;
 +  SSqlStatement* d_getDomainKeysQuery_stmt;
 +  SSqlStatement* d_deleteDomainKeyQuery_stmt;
 +  SSqlStatement* d_insertDomainKeyQuery_stmt;
 +  SSqlStatement* d_activateDomainKeyQuery_stmt;
 +  SSqlStatement* d_deactivateDomainKeyQuery_stmt;
 +  SSqlStatement* d_getTSIGKeyQuery_stmt;
 +  SSqlStatement* d_setTSIGKeyQuery_stmt;
 +  SSqlStatement* d_deleteTSIGKeyQuery_stmt;
 +  SSqlStatement* d_getTSIGKeysQuery_stmt;
  };
+ 
+ #endif /* PDNS_BINDBACKEND_HH */

diff --cc modules/goraclebackend/goraclebackend.hh
index 1ca3b8b05f6233f2d340d21863fa3decde0756e4,ba98811200bae7842693e0d062253cb33141e664..00f87ddedf960a0f7d71ec6450de2e221220d8da
--- 1/modules/goraclebackend/goraclebackend.hh
--- 2/modules/goraclebackend/goraclebackend.hh
+++ b/modules/goraclebackend/goraclebackend.hh
@@@ -10,4 -13,7 +13,6 @@@ class gOracleBackend : public GSQLBacke
  {
  public:
    gOracleBackend(const string &mode, const string &suffix); //!< Makes our connection to the database. Throws an exception if it fails.
 -  virtual string sqlEscape(const string &name);
  };
+ 
+ #endif /* PDNS_GORACLEBACKEND_HH */

diff --cc pdns/backends/gsql/gsqlbackend.hh
Simple merge

diff --cc pdns/resolver.hh
Simple merge