Merge up of dev trees.

[m6w6/libmemcached] / libmemcached / virtual_bucket.c

diff --git a/libmemcached/virtual_bucket.c b/libmemcached/virtual_bucket.c
index 26dd90c4bcff99f99020126a8be71723bdbf591a..74ec10ef63f2149ab3186d8e0b35fd23f247a5d4 100644 (file)
--- a/libmemcached/virtual_bucket.c
+++ b/libmemcached/virtual_bucket.c
@@ -35,7 +35,8 @@
  *
  */
 
-#include <libmemcached/common.h>
+#include <config.h>
+#include <libmemcached/memcached.h>
 #include <libmemcached/virtual_bucket.h>
 
 struct bucket_t {
@@ -70,7 +71,8 @@ memcached_return_t memcached_virtual_bucket_create(memcached_st *self,
   virtual_bucket->replicas= replicas;
   self->virtual_bucket= virtual_bucket;
 
-  for (uint32_t x=0; x < buckets; x++)
+  uint32_t x= 0;
+  for (; x < buckets; x++)
   {
     virtual_bucket->buckets[x].master= host_map[x];
     if (forward_map)