more cleanup

[awesomized/libmemcached] / src / libmemcached / hosts.cc

diff --git a/src/libmemcached/hosts.cc b/src/libmemcached/hosts.cc
index 0ce66130829bea0b63c83c9e2b6399cd468dbe5c..39247287666d55fed37f5b5f72242057fa5f462d 100644 (file)
--- a/src/libmemcached/hosts.cc
+++ b/src/libmemcached/hosts.cc
@@ -17,7 +17,10 @@
 #include "libmemcached/assert.hpp"
 
 #include <cmath>
-#include <sys/time.h>
+#if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+#endif
+#include <time.h>
 
 /* Protoypes (static) */
 static memcached_return_t update_continuum(Memcached *ptr);
@@ -345,7 +348,7 @@ memcached_return_t memcached_server_push(memcached_st *shell, const memcached_se
 
     ptr->state.is_parsing = true;
     for (uint32_t x = 0; x < count; ++x, ++original_host_size) {
-      WATCHPOINT_ASSERT(list[x].hostname[0] != 0);
+      WATCHPOINT_ASSERT(list[x].hostname[0]);
 
       // We have extended the array, and now we will find it, and use it.
       memcached_instance_st *instance = memcached_instance_fetch(ptr, original_host_size);
@@ -396,7 +399,7 @@ memcached_return_t memcached_instance_push(memcached_st *ptr,
   // We use original_host_size since size will now point to the first new
   // instance allocated.
   for (uint32_t x = 0; x < number_of_hosts; ++x, ++original_host_size) {
-    WATCHPOINT_ASSERT(list[x]._hostname[0] != 0);
+    WATCHPOINT_ASSERT(list[x]._hostname[0]);
 
     // We have extended the array, and now we will find it, and use it.
     memcached_instance_st *instance = memcached_instance_fetch(ptr, original_host_size);