projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-121
[m6w6/libmemcached]
/
libmemcached
/
common.h
diff --git
a/libmemcached/common.h
b/libmemcached/common.h
index dad5bf21efb32ca145742cf09c20ef7bad3aaa7e..53e083a433cd45f6849d4479fb5301d1a3e12734 100644
(file)
--- a/
libmemcached/common.h
+++ b/
libmemcached/common.h
@@
-42,31
+42,69
@@
#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
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <errno.h>
-#include <limits.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>
+# endif
+# ifdef HAVE_ERRNO_H
+# include <errno.h>
+# endif
+# ifdef HAVE_LIMITS_H
+# include <limits.h>
+# endif
#endif
#endif
-#include <fcntl.h>
-#include <sys/types.h>
-#include <unistd.h>
+#ifdef HAVE_SYS_UN_H
+# include <sys/un.h>
+#endif
+
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
#ifdef HAVE_STRINGS_H
#ifdef HAVE_STRINGS_H
-#include <strings.h>
+# include <strings.h>
+#endif
+
+#ifdef HAVE_DLFCN_H
+# include <dlfcn.h>
#endif
#include <libmemcached-1.0/memcached.h>
#endif
#include <libmemcached-1.0/memcached.h>
@@
-77,9
+115,17
@@
#include <libmemcached/server_instance.h>
#ifdef HAVE_POLL_H
#include <libmemcached/server_instance.h>
#ifdef HAVE_POLL_H
-#include <poll.h>
+#
include <poll.h>
#else
#else
-#include "poll/poll.h"
+# include "poll/poll.h"
+#endif
+
+#ifndef POLLHUP
+# define POLLHUP 0x0010
+#endif
+
+#ifndef POLLNVAL
+# define POLLNVAL 0x0020
#endif
#ifdef __cplusplus
#endif
#ifdef __cplusplus
@@
-117,6
+163,7
@@
memcached_return_t memcached_server_execute(memcached_st *ptr,
#include <libmemcached/quit.hpp>
#include <libmemcached/instance.hpp>
#include <libmemcached/server.hpp>
#include <libmemcached/quit.hpp>
#include <libmemcached/instance.hpp>
#include <libmemcached/server.hpp>
+#include <libmemcached/flag.hpp>
#include <libmemcached/behavior.hpp>
#include <libmemcached/sasl.hpp>
#include <libmemcached/server_list.hpp>
#include <libmemcached/behavior.hpp>
#include <libmemcached/sasl.hpp>
#include <libmemcached/server_list.hpp>
@@
-139,6
+186,7
@@
memcached_return_t memcached_server_execute(memcached_st *ptr,
#include <libmemcached/key.hpp>
#include <libmemcached/encoding_key.h>
#include <libmemcached/result.h>
#include <libmemcached/key.hpp>
#include <libmemcached/encoding_key.h>
#include <libmemcached/result.h>
+#include <libmemcached/version.hpp>
#endif
#include <libmemcached/continuum.hpp>
#endif
#include <libmemcached/continuum.hpp>