build fixes

git-svn-id: https://ttuki.vtt.fi/svn/p2p-next/TUD/p2tp/trunk@526 e16421f0-f15b-0410-abcd-98678b794739

diff --git a/bins.cpp b/bins.cpp
index 6d0d380..c745b2d 100644 (file)
--- a/bins.cpp
+++ b/bins.cpp
@@ -8,6 +8,7 @@
  */
 #include "bins.h"
 #include <string.h>
+#include <stdio.h>
 #include <algorithm>
 
 // make it work piece by piece

diff --git a/bins.h b/bins.h
index 2e5fa0b..349519d 100644 (file)
--- a/bins.h
+++ b/bins.h
@@ -9,7 +9,6 @@
 #ifndef BINS_H
 #define BINS_H
 #include "bin64.h"
-#include <gtest/gtest.h>
 
 /**  A binmap covering 2^64 range. Complexity limit: 100+200LoC  */
 class bins {
@@ -104,7 +103,9 @@ private:
     static int join32to16(uint32_t cell);
     
     friend class iterator;
+#ifdef FRIEND_TEST
     FRIEND_TEST(BinsTest,Routines);
+#endif
 };