[trac749] some modifications to make it compile

src/lib/datasrc/query.cc

@@ -12,7 +12,7 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#include <dns/buffer.h>
+#include <util/io/buffer.h>
 #include <dns/name.h>
 #include <dns/rrset.h>
 #include <dns/message.h>

src/lib/datasrc/tests/query_unittest.cc

@@ -14,7 +14,7 @@
 
 #include <gtest/gtest.h>
 
-#include <dns/buffer.h>
+#include <util/io/buffer.h>
 #include <dns/message.h>
 #include <dns/name.h>
 #include <dns/opcode.h>

src/lib/datasrc/tests/test_datasrc.cc

@@ -23,7 +23,7 @@
 
 #include <datasrc/data_source.h>
 
-#include <dns/buffer.h>
+#include <util/io/buffer.h>
 #include <dns/messagerenderer.h>
 #include <dns/name.h>
 #include <dns/rdata.h>

src/lib/util/tests/lru_list_unittest.cc

@@ -14,6 +14,7 @@
 
 #include <config.h>
 
+#include <stdint.h>
 #include <iostream>
 #include <algorithm>
 #include <string>

src/lib/util/tests/sha1_unittest.cc

@@ -19,9 +19,9 @@
 
 #include <gtest/gtest.h>
 
-#include <dns/tests/unittest_util.h>
+//#include <dns/tests/unittest_util.h>
 
-using isc::UnitTestUtil;
+//using isc::UnitTestUtil;
 using namespace std;
 
 namespace {