Merge Trond.

[m6w6/libmemcached] / libmemcached / memcached_string.h

diff --git a/libmemcached/memcached_string.h b/libmemcached/memcached_string.h
index e7e6db4de04922db5a57a409ad08337fad326d17..bed142811c217e51e72d9f881cc7b00876eb6f3f 100644 (file)
--- a/libmemcached/memcached_string.h
+++ b/libmemcached/memcached_string.h
@@ -15,11 +15,11 @@ extern "C" {
 
 struct memcached_string_st {
   memcached_st *root;
-  bool is_allocated;
   char *end;
+  char *string;
   size_t current_size;
   size_t block_size;
-  char *string;
+  bool is_allocated;
 };
 
 #define memcached_string_length(A) (size_t)((A)->end - (A)->string)
@@ -27,16 +27,23 @@ struct memcached_string_st {
 #define memcached_string_size(A) (A)->current_size
 #define memcached_string_value(A) (A)->string
 
+LIBMEMCACHED_API
 memcached_string_st *memcached_string_create(memcached_st *ptr,
                                              memcached_string_st *string,
                                              size_t initial_size);
+LIBMEMCACHED_API
 memcached_return memcached_string_check(memcached_string_st *string, size_t need);
+LIBMEMCACHED_API
 char *memcached_string_c_copy(memcached_string_st *string);
+LIBMEMCACHED_API
 memcached_return memcached_string_append_character(memcached_string_st *string,
                                                    char character);
+LIBMEMCACHED_API
 memcached_return memcached_string_append(memcached_string_st *string,
-                                         char *value, size_t length);
+                                         const char *value, size_t length);
+LIBMEMCACHED_API
 memcached_return memcached_string_reset(memcached_string_st *string);
+LIBMEMCACHED_API
 void memcached_string_free(memcached_string_st *string);
 
 #ifdef __cplusplus