Merging replication

[m6w6/libmemcached] / libmemcached / memcached_result.h

diff --git a/libmemcached/memcached_result.h b/libmemcached/memcached_result.h
index 4826042cfab328ef8463c2f757e2fb7cdd8bc02f..155a7abb093c1958768549cd228485e5d341f5d8 100644 (file)
--- a/libmemcached/memcached_result.h
+++ b/libmemcached/memcached_result.h
@@ -14,14 +14,14 @@ extern "C" {
 #endif
 
 struct memcached_result_st {
-  memcached_allocated is_allocated;
+  uint32_t flags;
+  bool is_allocated;
+  time_t expiration;
   memcached_st *root;
-  char key[MEMCACHED_MAX_KEY];
   size_t key_length;
-  memcached_string_st value;
-  uint32_t flags;
   uint64_t cas;
-  time_t expiration;
+  memcached_string_st value;
+  char key[MEMCACHED_MAX_KEY];
   /* Add result callback function */
 };