more cleanup

[m6w6/libmemcached] / src / libmemcached / string.hpp

diff --git a/src/libmemcached/string.hpp b/src/libmemcached/string.hpp
index 28aa4b003117f41090d0e6fbdeb5566687aad473..060318c833ddebde1ed936978a3f91b1d72c5eac 100644 (file)
--- a/src/libmemcached/string.hpp
+++ b/src/libmemcached/string.hpp
@@ -15,12 +15,9 @@
 
 #pragma once
 
-#include "util/string.hpp"
-
-#define memcached_literal_param         util_literal_param
-#define memcached_literal_param_size    util_literal_param_size
-#define memcached_string_make_from_cstr util_string_make_from_cstr
-#define memcached_array_length          util_array_length
+#define memcached_literal_param(str)          (str),strlen(str)
+#define memcached_literal_param_size(str)     strlen(str)
+#define memcached_string_make_from_cstr(str)  (str),((str)?strlen(str):0)
 
 /**
   Strings are always under our control so we make some assumptions