First merge of Trond's patches (cherry picking).

[m6w6/libmemcached] / libmemcached / memcached_io.h

diff --git a/libmemcached/memcached_io.h b/libmemcached/memcached_io.h
index 6bcf871b9854c6371c95c85317bddc21541ad85c..03d63b5585b0ecfc708612dcf5367a1325ba9792 100644 (file)
--- a/libmemcached/memcached_io.h
+++ b/libmemcached/memcached_io.h
@@ -1,8 +1,24 @@
-/* Server IO, Not public! */
-#include "libmemcached/memcached.h"
+/* LibMemcached
+ * Copyright (C) 2006-2009 Brian Aker
+ * All rights reserved.
+ *
+ * Use and distribution licensed under the BSD license.  See
+ * the COPYING file in the parent directory for full text.
+ *
+ * Summary: Server IO, Not public!
+ *
+ */
+
+#ifndef LIBMEMCACHED_MEMCACHED_IO_H
+#define LIBMEMCACHED_MEMCACHED_IO_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#ifndef __MEMCACHED_IO_H__
-#define __MEMCACHED_IO_H__
+#if defined(BUILDING_LIBMEMCACHED)
+
+#include "libmemcached/memcached.h"
 
 #define MAX_UDP_DATAGRAM_LENGTH 1400
 #define UDP_DATAGRAM_HEADER_LENGTH 8
@@ -26,24 +42,30 @@ 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);
-memcached_return memcached_io_read(memcached_server_st *ptr,
-                                   void *buffer, size_t length, ssize_t *nread);
+memcached_return_t 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,
-                                       size_t size);
-memcached_return memcached_io_close(memcached_server_st *ptr);
+memcached_return_t memcached_io_readline(memcached_server_st *ptr,
+                                         char *buffer_ptr,
+                                         size_t size);
+memcached_return_t memcached_io_close(memcached_server_st *ptr);
 /* Read n bytes of data from the server and store them in dta */
-memcached_return memcached_safe_read(memcached_server_st *ptr, 
-                                     void *dta, 
-                                     size_t size);
+memcached_return_t memcached_safe_read(memcached_server_st *ptr, 
+                                       void *dta, 
+                                       size_t size);
 /* Read a single response from the server */
-memcached_return memcached_read_one_response(memcached_server_st *ptr,
-                                             char *buffer, size_t buffer_length,
-                                             memcached_result_st *result);
-memcached_return memcached_io_init_udp_header(memcached_server_st *ptr,
-                                              uint16_t thread_id);
+memcached_return_t memcached_read_one_response(memcached_server_st *ptr,
+                                               char *buffer, size_t buffer_length,
+                                               memcached_result_st *result);
+memcached_return_t memcached_io_init_udp_header(memcached_server_st *ptr,
+                                                uint16_t thread_id);
 
 memcached_server_st *memcached_io_get_readable_server(memcached_st *memc);
 
-#endif /* __MEMCACHED_IO_H__ */
+#endif /* BUILDING_LIBMEMCACHED */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBMEMCACHED_MEMCACHED_IO_H */