X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fcommon.h;h=97990588374b2d7cbc298c340293832eba0e9acc;hb=d86bfe0802400ad5ebc14a72941d8528a0f795b9;hp=53e083a433cd45f6849d4479fb5301d1a3e12734;hpb=ad5cb8f903869065c72bb18bf98af6909189a5a9;p=awesomized%2Flibmemcached

diff --git a/libmemcached/common.h b/libmemcached/common.h
index 53e083a4..97990588 100644
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@ -111,21 +111,15 @@
 #include <libmemcached/watchpoint.h>
 #include <libmemcached/is.h>
 
-#include <libmemcached/instance.h>
+#ifdef __cplusplus
+# include "libmemcached/instance.hpp"
+#endif
 #include <libmemcached/server_instance.h>
 
 #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
@@ -213,7 +207,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