bug fix for recursive decent into quit()

[m6w6/libmemcached] / libmemcached / io.h

diff --git a/libmemcached/io.h b/libmemcached/io.h
index df7708c846c20461ceef81519f16a3e59b0d7df6..ca22c27d34c5018cce604e6d5e7c5235765a1d17 100644 (file)
--- a/libmemcached/io.h
+++ b/libmemcached/io.h
@@ -9,17 +9,17 @@
  *
  */
 
-#ifndef LIBMEMCACHED_MEMCACHED_IO_H
-#define LIBMEMCACHED_MEMCACHED_IO_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef __LIBMEMCACHED_IO_H__
+#define __LIBMEMCACHED_IO_H__
 
 #if defined(BUILDING_LIBMEMCACHED)
 
 #include "libmemcached/memcached.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define MAX_UDP_DATAGRAM_LENGTH 1400
 #define UDP_DATAGRAM_HEADER_LENGTH 8
 #define UDP_REQUEST_ID_MSG_SIG_DIGITS 10
@@ -42,7 +42,7 @@ struct udp_datagram_header_st
 
 LIBMEMCACHED_LOCAL
 ssize_t memcached_io_write(memcached_server_instance_st *ptr,
-                           const void *buffer, size_t length, char with_flush);
+                           const void *buffer, size_t length, bool with_flush);
 
 LIBMEMCACHED_LOCAL
 void memcached_io_reset(memcached_server_instance_st *ptr);
@@ -73,10 +73,10 @@ memcached_return_t memcached_io_init_udp_header(memcached_server_instance_st *pt
 LIBMEMCACHED_LOCAL
 memcached_server_instance_st *memcached_io_get_readable_server(memcached_st *memc);
 
-#endif /* BUILDING_LIBMEMCACHED */
-
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* LIBMEMCACHED_MEMCACHED_IO_H */
+#endif /* BUILDING_LIBMEMCACHED */
+
+#endif /* __LIBMEMCACHED_IO_H__ */