Merge in changes for ICC fix.

[awesomized/libmemcached] / libmemcached / parse.c

diff --git a/libmemcached/parse.c b/libmemcached/parse.c
index 73cc9dfec7d79ef461f71c6a61621bb408c783fe..917c5e3097b9874bfc0658c7bd199a4ed3ed3444 100644 (file)
--- a/libmemcached/parse.c
+++ b/libmemcached/parse.c
@@ -7,10 +7,10 @@
 
 #include "common.h"
 
-memcached_server_st *memcached_servers_parse(const char *server_strings)
+memcached_server_list_st memcached_servers_parse(const char *server_strings)
 {
   char *string;
-  uint32_t port;
+  in_port_t port;
   uint32_t weight;
   const char *begin_ptr;
   const char *end_ptr;
@@ -52,7 +52,7 @@ memcached_server_st *memcached_servers_parse(const char *server_strings)
 
       ptr++;
 
-      port= (uint32_t) strtoul(ptr, (char **)NULL, 10);
+      port= (in_port_t) strtoul(ptr, (char **)NULL, 10);
 
       ptr2= index(ptr, ' ');
       if (! ptr2)