Move public memcached_version declaration from lib/common.h to include/memcached.h.

[awesomized/libmemcached] / lib / common.h

diff --git a/lib/common.h b/lib/common.h
index 9e4cb5e17fb4346b98134f7ca8fa6354fdf8e5f0..f436cc025d0af6fbd52ce2a97c6df7f15a9c2ec5 100644 (file)
--- a/lib/common.h
+++ b/lib/common.h
@@ -21,7 +21,6 @@
 #include <fcntl.h>
 #include <sys/un.h>
 #include <netinet/tcp.h>
-#include <libmemcached_config.h>
 
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
@@ -41,6 +40,19 @@
 
 #include <libmemcached_config.h>
 
+#if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
+#define __builtin_expect(x, expected_value) (x)
+
+#define likely(x)       __builtin_expect((x),1)
+#define unlikely(x)     __builtin_expect((x),0)
+
+#else
+
+#define likely(x)       if((x))
+#define unlikely(x)     if((x))
+
+#endif
+
 #ifdef HAVE_DTRACE
 #define _DTRACE_VERSION 1
 #else
@@ -106,7 +118,6 @@ memcached_return memcached_string_reset(memcached_string_st *string);
 void memcached_string_free(memcached_string_st *string);
 memcached_return memcached_do(memcached_server_st *ptr, char *commmand, 
                               size_t command_length, uint8_t with_flush);
-memcached_return memcached_version(memcached_st *ptr);
 memcached_return value_fetch(memcached_server_st *ptr,
                              char *buffer,
                              memcached_result_st *result);