Fixes for OSX Lion

[m6w6/libmemcached] / libmemcached-1.0 / types.h

diff --git a/libmemcached-1.0/types.h b/libmemcached-1.0/types.h
index 18ac99c298e9c763fffb79d6108169f90ba28407..53992d3aee9717fd4bc9e4c10df3537d3b9c0960 100644 (file)
--- a/libmemcached-1.0/types.h
+++ b/libmemcached-1.0/types.h
@@ -39,6 +39,9 @@
 #pragma once
 
 #ifdef __cplusplus
+
+namespace org { namespace libmemcached { struct Instance; } }
+
 struct memcached_st;
 struct memcached_stat_st;
 struct memcached_analysis_st;
@@ -48,7 +51,8 @@ struct memcached_error_t;
 
 // All of the flavors of memcache_server_st
 struct memcached_server_st;
-typedef const struct memcached_server_st *memcached_server_instance_st;
+struct memcached_instance_st;
+typedef const org::libmemcached::Instance* memcached_server_instance_st;
 typedef struct memcached_server_st *memcached_server_list_st;
 
 struct memcached_callback_st;
@@ -69,7 +73,7 @@ typedef struct memcached_error_t memcached_error_t;
 
 // All of the flavors of memcache_server_st
 typedef struct memcached_server_st memcached_server_st;
-typedef const struct memcached_server_st *memcached_server_instance_st;
+typedef const void *memcached_server_instance_st;
 typedef struct memcached_server_st *memcached_server_list_st;
 
 typedef struct memcached_callback_st memcached_callback_st;
@@ -77,6 +81,5 @@ typedef struct memcached_callback_st memcached_callback_st;
 // The following two structures are internal, and never exposed to users.
 typedef struct memcached_string_st memcached_string_st;
 typedef struct memcached_string_t memcached_string_t;
-typedef struct memcached_continuum_item_st memcached_continuum_item_st;
 
 #endif