Merging Trond

[m6w6/libmemcached] / libmemcached / memcached_result.h

diff --git a/libmemcached/memcached_result.h b/libmemcached/memcached_result.h
index 47556e857b309819d0f2fb5b0d0087ca58c34ac0..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 */
 };
 
@@ -32,6 +32,7 @@ memcached_result_st *memcached_result_create(memcached_st *ptr,
                                              memcached_result_st *result);
 #define memcached_result_key_value(A) (A)->key
 #define memcached_result_key_length(A) (A)->key_length
+#define memcached_result_string_st(A) ((A)->value)
 #ifdef FIX
 #define memcached_result_value(A) memcached_string_value((A)->value)
 #define memcached_result_length(A) memcached_string_length((A)->value)