Merge Trond.

[m6w6/libmemcached] / libmemcached / memcached_string.h

diff --git a/libmemcached/memcached_string.h b/libmemcached/memcached_string.h
index b643302da9c4f3d3372de7e14b2d42d2cc61a92d..bed142811c217e51e72d9f881cc7b00876eb6f3f 100644 (file)
--- a/libmemcached/memcached_string.h
+++ b/libmemcached/memcached_string.h
@@ -6,17 +6,22 @@
  * Author: Brian Aker
  */
 
-#ifndef LIBMEMCACHED_MEMCACHED_STRING_H
-#define LIBMEMCACHED_MEMCACHED_STRING_H
-
-#ifndef LIBMEMCACHED_MEMCACHED_H
-#error "Please include <libmemcached/memcached.h> instead"
-#endif
+#ifndef __MEMCACHED_STRING_H__
+#define __MEMCACHED_STRING_H__
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct memcached_string_st {
+  memcached_st *root;
+  char *end;
+  char *string;
+  size_t current_size;
+  size_t block_size;
+  bool is_allocated;
+};
+
 #define memcached_string_length(A) (size_t)((A)->end - (A)->string)
 #define memcached_string_set_length(A, B) (A)->end= (A)->string + B
 #define memcached_string_size(A) (A)->current_size
@@ -45,4 +50,4 @@ void memcached_string_free(memcached_string_st *string);
 }
 #endif
 
-#endif /* LIBMEMCACHED_MEMCACHED_STRING_H */
+#endif /* __MEMCACHED_STRING_H__ */