projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Abstraction (which will save us merge hell with 1.2).
[awesomized/libmemcached]
/
libmemcached
/
common.h
diff --git
a/libmemcached/common.h
b/libmemcached/common.h
index 5c86eb16e01967360ccf3bef583e7a35cf66fb84..c7b84c94760d66ba97bb86cc833234abfc64e84e 100644
(file)
--- a/
libmemcached/common.h
+++ b/
libmemcached/common.h
@@
-42,64
+42,89
@@
#pragma once
#pragma once
-#include <config.h>
+#include <
mem_
config.h>
#ifdef __cplusplus
#ifdef __cplusplus
-# include <cstdio>
-# include <cstdlib>
-# include <cstring>
-# include <ctime>
-# include <cctype>
-# include <cerrno>
-# include <climits>
+# include <cstddef>
+# include <cstdio>
+# include <cstdlib>
+# include <cstring>
+# include <ctime>
+# include <cctype>
+# include <cerrno>
+# include <climits>
#else
#else
-# ifdef HAVE_STDLIB_H
-# include <stdio.h>
-# endif
-# ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-# endif
-# include <string.h>
+# ifdef HAVE_STDDEF_H
+# include <stddef.h>
+# endif
+# ifdef HAVE_STDLIB_H
+# include <stdio.h>
+# endif
+# ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+# endif
+# include <string.h>
+# ifdef HAVE_TIME_H
# include <time.h>
# include <time.h>
-# ifdef HAVE_ERRNO_H
-# include <errno.h>
-# endif
-# ifdef HAVE_LIMITS_H
-# include <limits.h>
-# endif
+# endif
+# ifdef HAVE_ERRNO_H
+# include <errno.h>
+# endif
+# ifdef HAVE_LIMITS_H
+# include <limits.h>
+# endif
+#endif
+
+#ifdef HAVE_SYS_UN_H
+# include <sys/un.h>
+#endif
+
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
#endif
#ifdef HAVE_FCNTL_H
#endif
#ifdef HAVE_FCNTL_H
-#
include <fcntl.h>
+# include <fcntl.h>
#endif
#ifdef HAVE_SYS_TYPES_H
#endif
#ifdef HAVE_SYS_TYPES_H
-#
include <sys/types.h>
+# include <sys/types.h>
#endif
#ifdef HAVE_UNISTD_H
#endif
#ifdef HAVE_UNISTD_H
-# include <unistd.h>
+# include <unistd.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
#endif
#ifdef HAVE_STRINGS_H
#endif
#ifdef HAVE_STRINGS_H
-#
include <strings.h>
+# include <strings.h>
#endif
#ifdef HAVE_DLFCN_H
#endif
#ifdef HAVE_DLFCN_H
-# include <dlfcn.h>
+# 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>
#endif
#include <libmemcached-1.0/memcached.h>
#include <libmemcached/watchpoint.h>
#include <libmemcached/is.h>
+typedef struct memcached_st Memcached;
-#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 <libmemcached/server_instance.h>
#ifdef HAVE_POLL_H
# include <poll.h>
#else
-# include "
poll
/poll.h"
+# include "
libmemcached
/poll.h"
#endif
#ifdef __cplusplus
#endif
#ifdef __cplusplus
@@
-187,7
+212,14
@@
extern "C" {
memcached_return_t run_distribution(memcached_st *ptr);
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
#define memcached_server_response_decrement(A) (A)->cursor_active_--
#define memcached_server_response_reset(A) (A)->cursor_active_=0