Merge in fixes for SASL.

[m6w6/libmemcached] / libmemcached / string.h

diff --git a/libmemcached/string.h b/libmemcached/string.h
index a0b66ed3fbb6d50aa325ca47451af9f4a6b1c24f..01097a653edc1ee9563158fd256e5fd7266b5c93 100644 (file)
--- a/libmemcached/string.h
+++ b/libmemcached/string.h
@@ -60,8 +60,6 @@ struct memcached_string_st {
   } options;
 };
 
-#ifdef BUILDING_LIBMEMCACHED
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -97,6 +95,9 @@ size_t memcached_string_size(const memcached_string_st *self);
 LIBMEMCACHED_LOCAL
 const char *memcached_string_value(const memcached_string_st *self);
 
+LIBMEMCACHED_LOCAL
+char *memcached_string_take_value(memcached_string_st *self);
+
 LIBMEMCACHED_LOCAL
 char *memcached_string_value_mutable(const memcached_string_st *self);
 
@@ -106,13 +107,3 @@ void memcached_string_set_length(memcached_string_st *self, size_t length);
 #ifdef __cplusplus
 }
 #endif
-
-#ifdef __cplusplus
-#define memcached_literal_param(X) (X), (static_cast<size_t>((sizeof(X) - 1)))
-#else
-#define memcached_literal_param(X) (X), ((size_t)((sizeof(X) - 1)))
-#endif
-
-#define memcached_string_make_from_cstr(X) (X), ((X) ? strlen(X) : 0)
-
-#endif