Merge Trond.

[m6w6/libmemcached] / libmemcached / server.h

diff --git a/libmemcached/server.h b/libmemcached/server.h
index d1a1cdacad5211549da66e835ae23b39819728cf..76400ee3838026c75a3a9babf95bdb6ea0a5db75 100644 (file)
--- a/libmemcached/server.h
+++ b/libmemcached/server.h
@@ -9,12 +9,9 @@
  *
  */
 
-#ifndef __MEMCACHED_SERVER_H__
-#define __MEMCACHED_SERVER_H__
+#ifndef __LIBMEMCACHED_SERVER_H__
+#define __LIBMEMCACHED_SERVER_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 struct memcached_server_st {
   struct {
@@ -51,26 +48,10 @@ struct memcached_server_st {
   char hostname[MEMCACHED_MAX_HOST_LENGTH];
 };
 
-// Local Only Inline
-static inline uint32_t memcached_servers_count(memcached_server_st *servers)
-{
-  return servers->number_of_hosts;
-}
 
-// Local Only Inline
-static inline uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count)
-{
-  return servers->number_of_hosts= count;
-}
-
-
-
-#define memcached_server_count(A) (A)->number_of_hosts
-#define memcached_server_name(A,B) (B).hostname
-#define memcached_server_port(A,B) (B).port
-#define memcached_server_list(A) (A)->servers
-#define memcached_server_list_set(A,B) (A)->servers=(B)
-#define memcached_server_response_count(A) (A)->cursor_active
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 LIBMEMCACHED_API
 memcached_return_t memcached_server_cursor(memcached_st *ptr,
@@ -163,9 +144,28 @@ memcached_server_st *memcached_server_list_append_with_weight(memcached_server_s
 LIBMEMCACHED_API
 unsigned int memcached_server_list_count(memcached_server_st *ptr);
 
+// Local Only Inline
+static inline uint32_t memcached_servers_count(memcached_server_st *servers)
+{
+  return servers->number_of_hosts;
+}
 
-#ifdef __cplusplus
+// Local Only Inline
+static inline uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count)
+{
+  return servers->number_of_hosts= count;
 }
+
+
+#define memcached_server_count(A) (A)->number_of_hosts
+#define memcached_server_name(A,B) (B).hostname
+#define memcached_server_port(A,B) (B).port
+#define memcached_server_list(A) (A)->servers
+#define memcached_server_list_set(A,B) (A)->servers=(B)
+#define memcached_server_response_count(A) (A)->cursor_active
+
+#ifdef __cplusplus
+} // extern "C"
 #endif
 
-#endif /* __MEMCACHED_SERVER_H__ */
+#endif /* __LIBMEMCACHED_SERVER_H__ */