DTrace support

[m6w6/libmemcached] / lib / memcached_string.c

diff --git a/lib/memcached_string.c b/lib/memcached_string.c
index 5b2b9d5082b59e3f62b2d641bc3db0e708ea6c61..63ffb59af03a152c9f5b5924f28100f873580bd3 100644 (file)
--- a/lib/memcached_string.c
+++ b/lib/memcached_string.c
@@ -1,8 +1,8 @@
-#include <memcached.h>
+#include "common.h"
 
 memcached_return memcached_string_check(memcached_string_st *string, size_t need)
 {
-  if (need > (string->current_size - (string->end - string->string)))
+  if (need > (size_t)(string->current_size - (size_t)(string->end - string->string)))
   {
     size_t current_offset= string->end - string->string;
     char *new_value;
@@ -18,7 +18,7 @@ memcached_return memcached_string_check(memcached_string_st *string, size_t need
     string->current_size+= string->block_size;
 
     /* We zero the block structure we just realloced */
-    memset((string + string->current_size) - string->block_size , 0, 
+    memset((string->string + string->current_size) - string->block_size , 0, 
            sizeof(char) * string->block_size);
   }