X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fstring.h;h=ca3dad14faa64e2601c652b1f98b624a26df69b6;hb=f285e1b3821f56a8983b5ce9fb1a0070e7bb0a1c;hp=f6a13bb000f7b695fad5ed3d9beda7585bb6712b;hpb=1f5cf20c75c7187df1d648a5a200b52db3f17db1;p=awesomized%2Flibmemcached

diff --git a/libmemcached/string.h b/libmemcached/string.h
index f6a13bb0..ca3dad14 100644
--- a/libmemcached/string.h
+++ b/libmemcached/string.h
@@ -27,7 +27,7 @@ struct memcached_string_st {
   char *end;
   char *string;
   size_t current_size;
-  const memcached_st *root;
+  memcached_st *root;
   struct {
     bool is_allocated:1;
     bool is_initialized:1;
@@ -84,11 +84,18 @@ void memcached_string_set_length(memcached_string_st *self, size_t length);
 }
 #endif
 
+#ifdef BUILDING_LIBMEMCACHED
 
 #ifdef __cplusplus
 #define memcached_string_with_size(X) (X), (static_cast<size_t>((sizeof(X) - 1)))
+#define memcached_string_make(X) (static_cast<size_t>((sizeof(X) - 1))), (X)
 #else
 #define memcached_string_with_size(X) (X), ((size_t)((sizeof(X) - 1)))
+#define memcached_string_make(X) (((size_t)((sizeof(X) - 1))), (X)
+#endif
+
+#define memcached_string_make_from_cstr(X) (X), ((X) ? strlen(X) : 0)
+
 #endif
 
 #endif /* __LIBMEMCACHED_STRING_H__ */