attempt to fix #12, #49 and #65

[awesomized/libmemcached] / libmemcached / common.h

diff --git a/libmemcached/common.h b/libmemcached/common.h
index 71db19b01bd85b2d59faa99ec9ad39c0c086ec89..8cedc5214b24f12b92d63e86b2bea7f0ce706850 100644 (file)
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@ -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 */
@@ -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/memcached/protocol_binary.h"
+# include "libmemcachedprotocol-0.0/binary.h"
 # include "libmemcached/io.hpp"
 # include "libmemcached/udp.hpp"
 # include "libmemcached/do.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