Merge branch 'trac1245' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac1245

src/lib/dns/python/edns_python.cc

@@ -177,7 +177,7 @@ EDNS_toText(const s_EDNS* const self) {
 }
 
 PyObject*
-EDNS_str(PyObject* const self) {
+EDNS_str(PyObject* self) {
     // Simply call the to_text method we already defined
     return (PyObject_CallMethod(self,
                                 const_cast<char*>("to_text"),

src/lib/dns/python/pydnspp.cc

@@ -27,8 +27,6 @@
 #include <Python.h>
 #include <structmember.h>
 
-#include <config.h>
-
 #include "pydnspp_common.h"
 /* Note that we do forward declarations of the initialization functions here,
  * and these are not defined in headers (since they are not to be used in any

src/lib/dns/python/pydnspp_common.cc

@@ -15,9 +15,6 @@
 #include <Python.h>
 #include <pydnspp_common.h>
 
-
-#include <config.h>
-
 #include <exceptions/exceptions.h>
 
 #include <util/buffer.h>