summaryrefslogtreecommitdiff
path: root/libmemcached/common.h
diff options
context:
space:
mode:
Diffstat (limited to 'libmemcached/common.h')
-rw-r--r--libmemcached/common.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/libmemcached/common.h b/libmemcached/common.h
index 0180baca..8e899b70 100644
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@ -107,7 +107,7 @@
# include <dlfcn.h>
#endif
-#if defined(WIN32) || defined(__MINGW32__)
+#if defined(_WIN32)
# include "libmemcached/windows.hpp"
#endif
@@ -124,7 +124,7 @@ typedef struct memcached_st Memcached;
#endif
#ifdef __cplusplus
-org::libmemcached::Instance* memcached_instance_fetch(memcached_st *ptr, uint32_t server_key);
+memcached_instance_st* memcached_instance_fetch(memcached_st *ptr, uint32_t server_key);
#endif
/* These are private not to be installed headers */
@@ -199,7 +199,7 @@ extern "C" {
memcached_return_t run_distribution(memcached_st *ptr);
#ifdef __cplusplus
-static inline void memcached_server_response_increment(org::libmemcached::Instance* instance)
+static inline void memcached_server_response_increment(memcached_instance_st* instance)
{
instance->events(POLLIN);
instance->cursor_active_++;
@@ -218,6 +218,6 @@ static inline void memcached_server_response_increment(org::libmemcached::Instan
#endif
#ifdef __cplusplus
-bool memcached_purge(org::libmemcached::Instance*);
-org::libmemcached::Instance* memcached_instance_by_position(const memcached_st *ptr, uint32_t server_key);
+bool memcached_purge(memcached_instance_st*);
+memcached_instance_st* memcached_instance_by_position(const memcached_st *ptr, uint32_t server_key);
#endif