Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-202

[awesomized/libmemcached] / libmemcached / common.h

diff --git a/libmemcached/common.h b/libmemcached/common.h
index cc38b56d49f42e9d9409750ec8830bcfdbb7036d..c7b84c94760d66ba97bb86cc833234abfc64e84e 100644 (file)
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@ -107,9 +107,14 @@
 # include <dlfcn.h>
 #endif
 
+#if defined(WIN32) || defined(__MINGW32__)
+# include "libmemcached/windows.hpp"
+#endif
+
 #include <libmemcached-1.0/memcached.h>
 #include <libmemcached/watchpoint.h>
 #include <libmemcached/is.h>
+typedef struct memcached_st Memcached;
 
 #ifdef __cplusplus
 # include "libmemcached/instance.hpp"
@@ -119,15 +124,7 @@
 #ifdef HAVE_POLL_H
 # include <poll.h>
 #else
-# include "poll/poll.h"
-#endif
-
-#ifndef POLLHUP
-# define POLLHUP               0x0010
-#endif
-
-#ifndef POLLNVAL
-# define POLLNVAL      0x0020
+# include "libmemcached/poll.h"
 #endif
 
 #ifdef __cplusplus
@@ -215,7 +212,14 @@ extern "C" {
 
 memcached_return_t run_distribution(memcached_st *ptr);
 
-#define memcached_server_response_increment(A) (A)->cursor_active_++
+#ifdef __cplusplus
+static inline void memcached_server_response_increment(org::libmemcached::Instance* instance)
+{
+  instance->events(POLLIN);
+  instance->cursor_active_++;
+}
+#endif
+
 #define memcached_server_response_decrement(A) (A)->cursor_active_--
 #define memcached_server_response_reset(A) (A)->cursor_active_=0