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

[awesomized/libmemcached] / libtest / test.hpp

diff --git a/libtest/test.hpp b/libtest/test.hpp
index 7676048745bf4bb0798ac0ddd78e212bf20ba9fd..7da55bd5e1c1f141bb900af06e9777d7cf1fdc33 100644 (file)
--- a/libtest/test.hpp
+++ b/libtest/test.hpp
@@ -42,17 +42,6 @@
 #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>
 
@@ -63,6 +52,7 @@
 #include <libtest/error.h>
 #include <libtest/strerror.h>
 #include <libtest/timer.hpp>
+#include <libtest/alarm.h>
 #include <libtest/stream.h>
 #include <libtest/comparison.hpp>
 #include <libtest/server.h>
@@ -85,3 +75,4 @@
 #include <libtest/http.hpp>
 #include <libtest/cpu.hpp>
 #include <libtest/tmpfile.hpp>
+#include <libtest/client.hpp>