projects
/
awesomized
/
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-202
[awesomized/libmemcached]
/
libmemcached
/
common.h
diff --git
a/libmemcached/common.h
b/libmemcached/common.h
index cc71ac5f8123813588832780b5e0b6052bd8d761..c7b84c94760d66ba97bb86cc833234abfc64e84e 100644
(file)
--- a/
libmemcached/common.h
+++ b/
libmemcached/common.h
@@
-107,9
+107,14
@@
# include <dlfcn.h>
#endif
# 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>
#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"
#ifdef __cplusplus
# include "libmemcached/instance.hpp"
@@
-119,15
+124,7
@@
#ifdef HAVE_POLL_H
# include <poll.h>
#else
#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
#endif
#ifdef __cplusplus