X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_result.h;h=155a7abb093c1958768549cd228485e5d341f5d8;hb=29db6c77e126d9ae0c416ad76402fdbef7372cdb;hp=2b08d39603bc7bd7c7f2a8de0e7e970ad3ae570d;hpb=eb59b82618de62fba5bdd833a4c82fbefa9546af;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached_result.h b/libmemcached/memcached_result.h
index 2b08d396..155a7abb 100644
--- 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)
@@ -42,8 +43,8 @@ size_t memcached_result_length(memcached_result_st *ptr);
 #define memcached_result_flags(A) (A)->flags
 #define memcached_result_cas(A) (A)->cas
 memcached_return memcached_result_set_value(memcached_result_st *ptr, char *value, size_t length);
-void memcached_result_set_flags(A,B) (A)->flags= B
-void memcached_result_set_expiration(A) (A)->expiration
+#define memcached_result_set_flags(A,B) (A)->flags=(B)
+#define memcached_result_set_expiration(A,B) (A)->expiration=(B)
 
 #ifdef __cplusplus
 }