Merge from trunk.

[m6w6/libmemcached] / libmemcached / basic_string.h

diff --git a/libmemcached/basic_string.h b/libmemcached/basic_string.h
index 50dbce63d5a5428838dd3107cd2546bb35e089f5..de8d3d51c6127f3adc1dcdfcf6f54c13ecbde4be 100644 (file)
--- a/libmemcached/basic_string.h
+++ b/libmemcached/basic_string.h
@@ -36,9 +36,11 @@
 
 #pragma once
 
+// No assumptions of NULL should be made
+
 struct memcached_string_t {
-  size_t size;
   const char *c_str;
+  size_t size;
 };
 
 #define memcached_size(X) (X).size;