projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
c++: fix return value type
[awesomized/libmemcached]
/
libmemcached
/
common.h
diff --git
a/libmemcached/common.h
b/libmemcached/common.h
index 4ab2680616ca3c8e9c94ac9d55ead63a7a1f21a7..8cedc5214b24f12b92d63e86b2bea7f0ce706850 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
@@
-123,7
+123,7
@@
typedef struct memcached_st Memcached;
#endif
#ifdef __cplusplus
#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 */
#endif
/* These are private not to be installed headers */
@@
-132,7
+132,7
@@
org::libmemcached::Instance* memcached_instance_fetch(memcached_st *ptr, uint32_
#include "libmemcached/io.h"
#ifdef __cplusplus
# include "libmemcached/string.hpp"
#include "libmemcached/io.h"
#ifdef __cplusplus
# include "libmemcached/string.hpp"
-# include "libmemcached
/memcached/protocol_
binary.h"
+# include "libmemcached
protocol-0.0/
binary.h"
# include "libmemcached/io.hpp"
# include "libmemcached/udp.hpp"
# include "libmemcached/do.hpp"
# include "libmemcached/io.hpp"
# include "libmemcached/udp.hpp"
# include "libmemcached/do.hpp"
@@
-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"
@@
-198,7
+198,7
@@
extern "C" {
memcached_return_t run_distribution(memcached_st *ptr);
#ifdef __cplusplus
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_++;
{
instance->events(POLLIN);
instance->cursor_active_++;
@@
-217,6
+217,6
@@
static inline void memcached_server_response_increment(org::libmemcached::Instan
#endif
#ifdef __cplusplus
#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
#endif