X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fcommon.h;h=897b0969028ec9184980b2d3217f6570edb8c879;hb=00ce081cdb5bcb602d6303dcf691d981ec8926e0;hp=c7b84c94760d66ba97bb86cc833234abfc64e84e;hpb=326e812b0ca940bf90aaadf69312a0316091d0cb;p=awesomized%2Flibmemcached diff --git a/libmemcached/common.h b/libmemcached/common.h index c7b84c94..897b0969 100644 --- a/libmemcached/common.h +++ b/libmemcached/common.h @@ -107,20 +107,15 @@ # include #endif -#if defined(WIN32) || defined(__MINGW32__) +#if defined(_WIN32) # include "libmemcached/windows.hpp" #endif #include -#include -#include +#include "libmemcached/watchpoint.h" +#include "libmemcached/is.h" typedef struct memcached_st Memcached; -#ifdef __cplusplus -# include "libmemcached/instance.hpp" -#endif -#include - #ifdef HAVE_POLL_H # include #else @@ -128,67 +123,57 @@ typedef struct memcached_st Memcached; #endif #ifdef __cplusplus -extern "C" { +memcached_instance_st* memcached_instance_fetch(memcached_st *ptr, uint32_t server_key); #endif -typedef memcached_return_t (*memcached_server_execute_fn)(memcached_st *ptr, memcached_server_write_instance_st server, void *context); - +/* These are private not to be installed headers */ +#include "libmemcached/error.hpp" +#include "libmemcached/memory.h" +#include "libmemcached/io.h" #ifdef __cplusplus -} // extern "C" +# include "libmemcached/string.hpp" +# include "libmemcached/memcached/protocol_binary.h" +# include "libmemcached/io.hpp" +# include "libmemcached/udp.hpp" +# include "libmemcached/do.hpp" +# include "libmemcached/socket.hpp" +# include "libmemcached/connect.hpp" +# include "libmemcached/allocators.hpp" +# include "libmemcached/hash.hpp" +# include "libmemcached/quit.hpp" +# include "libmemcached/instance.hpp" +# include "libmemcached/server_instance.h" +# include "libmemcached/server.hpp" +# include "libmemcached/flag.hpp" +# include "libmemcached/behavior.hpp" +# include "libmemcached/sasl.hpp" +# include "libmemcached/server_list.hpp" #endif +#include "libmemcached/internal.h" +#include "libmemcached/array.h" +#include "libmemcached/libmemcached_probes.h" +#include "libmemcached/byteorder.h" +#include "libmemcached/initialize_query.h" #ifdef __cplusplus -org::libmemcached::Instance* memcached_instance_fetch(memcached_st *ptr, uint32_t server_key); -#endif - -memcached_return_t memcached_server_execute(memcached_st *ptr, - memcached_server_execute_fn callback, - void *context); -/* These are private not to be installed headers */ -#include -#include -#include -#ifdef __cplusplus -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#endif -#include -#include -#include -#include -#include -#ifdef __cplusplus -#include +# include "libmemcached/response.h" +# include "libmemcached/namespace.h" +#else +# include "libmemcached/virtual_bucket.h" #endif -#include -#include #ifdef __cplusplus -#include -#include -#include -#include -#include -#include -#include +# include "libmemcached/backtrace.hpp" +# include "libmemcached/assert.hpp" +# include "libmemcached/server.hpp" +# include "libmemcached/key.hpp" +# include "libmemcached/encoding_key.h" +# include "libmemcached/result.h" +# include "libmemcached/version.hpp" #endif -#include +#include "libmemcached/continuum.hpp" #if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96) @@ -213,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_++; @@ -232,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