Updating for version .32

[awesomized/libmemcached] / libmemcached / memcached_result.h

diff --git a/libmemcached/memcached_result.h b/libmemcached/memcached_result.h
index 4826042cfab328ef8463c2f757e2fb7cdd8bc02f..e7ce012b3884e814e50b065c496b00b00c0e91b6 100644 (file)
--- a/libmemcached/memcached_result.h
+++ b/libmemcached/memcached_result.h
@@ -14,20 +14,23 @@ 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 */
 };
 
 /* Result Struct */
+LIBMEMCACHED_API
 void memcached_result_free(memcached_result_st *result);
+LIBMEMCACHED_API
 void memcached_result_reset(memcached_result_st *ptr);
+LIBMEMCACHED_API
 memcached_result_st *memcached_result_create(memcached_st *ptr, 
                                              memcached_result_st *result);
 #define memcached_result_key_value(A) (A)->key
@@ -37,12 +40,15 @@ memcached_result_st *memcached_result_create(memcached_st *ptr,
 #define memcached_result_value(A) memcached_string_value((A)->value)
 #define memcached_result_length(A) memcached_string_length((A)->value)
 #else
+LIBMEMCACHED_API
 char *memcached_result_value(memcached_result_st *ptr);
+LIBMEMCACHED_API
 size_t memcached_result_length(memcached_result_st *ptr);
 #endif
 #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);
+LIBMEMCACHED_API
+memcached_return memcached_result_set_value(memcached_result_st *ptr, const char *value, size_t length);
 #define memcached_result_set_flags(A,B) (A)->flags=(B)
 #define memcached_result_set_expiration(A,B) (A)->expiration=(B)