Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-66

[awesomized/libmemcached] / libtest / test.hpp

diff --git a/libtest/test.hpp b/libtest/test.hpp
index c269e54185fe892d4c318b52d555a8198dca8d20..7676048745bf4bb0798ac0ddd78e212bf20ba9fd 100644 (file)
--- a/libtest/test.hpp
+++ b/libtest/test.hpp
@@ -42,6 +42,17 @@
 #include <cstdlib>
 #include <arpa/inet.h>
 
+#ifdef TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <ctime>
+#else
+# ifdef HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <ctime>
+# endif
+#endif
+
 #include <libtest/visibility.h>
 #include <libtest/version.h>
 
@@ -51,6 +62,7 @@
 #include <libtest/has.hpp>
 #include <libtest/error.h>
 #include <libtest/strerror.h>
+#include <libtest/timer.hpp>
 #include <libtest/stream.h>
 #include <libtest/comparison.hpp>
 #include <libtest/server.h>
@@ -64,11 +76,9 @@
 #include <libtest/port.h>
 #include <libtest/is_local.hpp>
 #include <libtest/socket.hpp>
-#include <libtest/stats.h>
 #include <libtest/collection.h>
 #include <libtest/framework.h>
 #include <libtest/get.h>
-#include <libtest/stream.h>
 #include <libtest/cmdline.h>
 #include <libtest/string.hpp>
 #include <libtest/binaries.h>