X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_io.h;h=da253955d156db2c5b35458f894f0803076cf635;hb=dbd274af6fc88a8f7a0456eb419a753dd842c88f;hp=5442277447d658020b5a66a28427fad353bd04d8;hpb=1755fafe88a045369be7291fbe92bbaf9449ee41;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memcached_io.h b/libmemcached/memcached_io.h
index 54422774..da253955 100644
--- a/libmemcached/memcached_io.h
+++ b/libmemcached/memcached_io.h
@@ -1,8 +1,17 @@
-/* Server IO, Not public! */
-#include <memcached.h>
+/*
+ * Summary: Server IO, Not public!
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Brian Aker
+ */
 
-#ifndef __MEMCACHED_IO_H__
-#define __MEMCACHED_IO_H__
+#ifndef LIBMEMCACHED_MEMCACHED_IO_H
+#define LIBMEMCACHED_MEMCACHED_IO_H
+
+#if defined(BUILDING_LIBMEMCACHED)
+
+#include "libmemcached/memcached.h"
 
 #define MAX_UDP_DATAGRAM_LENGTH 1400
 #define UDP_DATAGRAM_HEADER_LENGTH 8
@@ -26,8 +35,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,
@@ -46,4 +55,5 @@ memcached_return memcached_io_init_udp_header(memcached_server_st *ptr,
 
 memcached_server_st *memcached_io_get_readable_server(memcached_st *memc);
 
-#endif /* __MEMCACHED_IO_H__ */
+#endif /* BUILDING_LIBMEMCACHED */
+#endif /* LIBMEMCACHED_MEMCACHED_IO_H */