projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Harmonize WIN32, and update bootstrap
[m6w6/libmemcached]
/
libmemcached
/
common.h
diff --git
a/libmemcached/common.h
b/libmemcached/common.h
index 4ab2680616ca3c8e9c94ac9d55ead63a7a1f21a7..71db19b01bd85b2d59faa99ec9ad39c0c086ec89 100644
(file)
--- a/
libmemcached/common.h
+++ b/
libmemcached/common.h
@@
-107,7
+107,7
@@
# include <dlfcn.h>
#endif
# include <dlfcn.h>
#endif
-#if defined(
WIN32) || defined(__MINGW32__
)
+#if defined(
_WIN32
)
# include "libmemcached/windows.hpp"
#endif
# include "libmemcached/windows.hpp"
#endif
@@
-158,11
+158,11
@@
org::libmemcached::Instance* memcached_instance_fetch(memcached_st *ptr, uint32_
#ifdef __cplusplus
# include "libmemcached/response.h"
#ifdef __cplusplus
# include "libmemcached/response.h"
+# include "libmemcached/namespace.h"
+#else
+# include "libmemcached/virtual_bucket.h"
#endif
#endif
-#include "libmemcached/namespace.h"
-#include "libmemcached/virtual_bucket.h"
-
#ifdef __cplusplus
# include "libmemcached/backtrace.hpp"
# include "libmemcached/assert.hpp"
#ifdef __cplusplus
# include "libmemcached/backtrace.hpp"
# include "libmemcached/assert.hpp"