X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fcommon.h;h=897b0969028ec9184980b2d3217f6570edb8c879;hb=6730933820b3c3f7b016b4d33a209198d195a37a;hp=4ab2680616ca3c8e9c94ac9d55ead63a7a1f21a7;hpb=bf8213041709c75147393c8bd6b51b8f9e064f7c;p=awesomized%2Flibmemcached

diff --git a/libmemcached/common.h b/libmemcached/common.h
index 4ab26806..897b0969 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
 
@@ -123,7 +123,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 */
@@ -158,11 +158,11 @@ org::libmemcached::Instance* memcached_instance_fetch(memcached_st *ptr, uint32_
 
 #ifdef __cplusplus
 # include "libmemcached/response.h"
+# include "libmemcached/namespace.h"
+#else
+# include "libmemcached/virtual_bucket.h"
 #endif
 
-#include "libmemcached/namespace.h"
-#include "libmemcached/virtual_bucket.h"
-
 #ifdef __cplusplus
 # include "libmemcached/backtrace.hpp"
 # include "libmemcached/assert.hpp"
@@ -198,7 +198,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_++;
@@ -217,6 +217,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