#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))
+#else
+
+#define likely(x) if(__builtin_expect(!!(x), 1))
+#define unlikely(x) if(__builtin_expect((x), 0))
#endif
+
#ifdef HAVE_DTRACE
#define _DTRACE_VERSION 1
#else
memcached_return memcachd_key_test(char **keys, size_t *key_length,
unsigned int number_of_keys);
+void sort_hosts(memcached_st *ptr);
+
#endif /* __COMMON_H__ */