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

[awesomized/libmemcached] / clients / ms_thread.c

diff --git a/clients/ms_thread.c b/clients/ms_thread.c
index 1efe5cfbb6f62df9dc8975033065d6ae933db002..264cca7c3a0e162b2d6a1083ca9dc77c33915fff 100644 (file)
--- a/clients/ms_thread.c
+++ b/clients/ms_thread.c
@@ -9,18 +9,16 @@
  *
  */
 
-#include "config.h"
+#include "mem_config.h"
 
-#if TIME_WITH_SYS_TIME
+#if defined(HAVE_SYS_TIME_H)
 # include <sys/time.h>
+#endif
+
+#if defined(HAVE_TIME_H)
 # include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+
 #include "ms_thread.h"
 #include "ms_setting.h"
 #include "ms_atomic.h"