First pass through to make sure malloc is type safe

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

diff --git a/libmemcached-1.0/types.h b/libmemcached-1.0/types.h
index 3a4ae3bd04722e1f620172a692a66db624b3c1b2..2781321e7c2beecb4daec51ab0960fd7c3b2c390 100644 (file)
--- a/libmemcached-1.0/types.h
+++ b/libmemcached-1.0/types.h
@@ -38,6 +38,28 @@
 
 #pragma once
 
+#ifdef __cplusplus
+struct memcached_st;
+struct memcached_stat_st;
+struct memcached_analysis_st;
+struct memcached_result_st;
+struct memcached_array_st;
+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;
+typedef struct memcached_server_st *memcached_server_list_st;
+
+struct memcached_callback_st;
+
+// The following two structures are internal, and never exposed to users.
+struct memcached_string_st;
+struct memcached_string_t;
+struct memcached_continuum_item_st;
+
+#else
+
 typedef struct memcached_st memcached_st;
 typedef struct memcached_stat_st memcached_stat_st;
 typedef struct memcached_analysis_st memcached_analysis_st;
@@ -57,6 +79,8 @@ 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
+
 
 #ifdef __cplusplus
 extern "C" {