Made the new memslap code build. Moved config.h include to the beginning of each...

[m6w6/libmemcached] / libmemcached / memcached_types.h

diff --git a/libmemcached/memcached_types.h b/libmemcached/memcached_types.h
index 538ab4bf15b0a09e9ccdc1f63be3d227d4f222f1..9d2537d4064f8a5804c0584a7c4e087238f35617 100644 (file)
--- a/libmemcached/memcached_types.h
+++ b/libmemcached/memcached_types.h
@@ -6,8 +6,8 @@
  * Author: Brian Aker
  */
 
-#ifndef __MEMCACHED_TYPES_H__
-#define __MEMCACHED_TYPES_H__
+#ifndef LIBMEMCACHED_MEMCACHED_TYPES_H
+#define LIBMEMCACHED_MEMCACHED_TYPES_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -25,6 +25,7 @@ typedef memcached_return (*memcached_cleanup_func)(memcached_st *ptr);
 typedef void (*memcached_free_function)(memcached_st *ptr, void *mem);
 typedef void *(*memcached_malloc_function)(memcached_st *ptr, const size_t size);
 typedef void *(*memcached_realloc_function)(memcached_st *ptr, void *mem, const size_t size);
+typedef void *(*memcached_calloc_function)(memcached_st *ptr, size_t nelem, const size_t elsize);
 typedef memcached_return (*memcached_execute_function)(memcached_st *ptr, memcached_result_st *result, void *context);
 typedef memcached_return (*memcached_server_function)(memcached_st *ptr, memcached_server_st *server, void *context);
 typedef memcached_return (*memcached_trigger_key)(memcached_st *ptr,  
@@ -36,8 +37,14 @@ typedef memcached_return (*memcached_trigger_delete_key)(memcached_st *ptr,
 typedef memcached_return (*memcached_dump_func)(memcached_st *ptr,  
                                                 const char *key, size_t key_length, void *context);
 
+typedef struct {
+  memcached_execute_function *callback;
+  void *context;
+  unsigned int number_of_callback;
+} memcached_callback_st;
+
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* __MEMCACHED_TYPES_H__ */
+#endif /* LIBMEMCACHED_MEMCACHED_TYPES_H */