Merging Trond

[m6w6/libmemcached] / libmemcached / memcached_parse.c

diff --git a/libmemcached/memcached_parse.c b/libmemcached/memcached_parse.c
index 8bb56f5381dc2071c7f66b4ee33d732b7a6be5a2..62896dea4d65072fe859250982d038078d57624f 100644 (file)
--- a/libmemcached/memcached_parse.c
+++ b/libmemcached/memcached_parse.c
@@ -5,7 +5,7 @@
   Frankly its too damn useful not to be here though.
 */
 
-#include <memcached.h>
+#include "libmemcached/memcached.h"
 #include "common.h"
 
 memcached_server_st *memcached_servers_parse(const char *server_strings)
@@ -13,8 +13,8 @@ memcached_server_st *memcached_servers_parse(const char *server_strings)
   char *string;
   unsigned int port;
   uint32_t weight;
-  char *begin_ptr;
-  char *end_ptr;
+  const char *begin_ptr;
+  const char *end_ptr;
   memcached_server_st *servers= NULL;
   memcached_return rc;