Merging Trond

[awesomized/libmemcached] / libmemcached / memcached_io.h

diff --git a/libmemcached/memcached_io.h b/libmemcached/memcached_io.h
index 5442277447d658020b5a66a28427fad353bd04d8..6bcf871b9854c6371c95c85317bddc21541ad85c 100644 (file)
--- a/libmemcached/memcached_io.h
+++ b/libmemcached/memcached_io.h
@@ -1,5 +1,5 @@
 /* Server IO, Not public! */
-#include <memcached.h>
+#include "libmemcached/memcached.h"
 
 #ifndef __MEMCACHED_IO_H__
 #define __MEMCACHED_IO_H__
@@ -26,8 +26,8 @@ struct udp_datagram_header_st {
 ssize_t memcached_io_write(memcached_server_st *ptr,
                            const void *buffer, size_t length, char with_flush);
 void memcached_io_reset(memcached_server_st *ptr);
-ssize_t memcached_io_read(memcached_server_st *ptr,
-                          void *buffer, size_t length);
+memcached_return memcached_io_read(memcached_server_st *ptr,
+                                   void *buffer, size_t length, ssize_t *nread);
 /* Read a line (terminated by '\n') into the buffer */
 memcached_return memcached_io_readline(memcached_server_st *ptr,
                                        char *buffer_ptr,