projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix for non-Linux platforms.
[awesomized/libmemcached]
/
libmemcached
/
allocators.h
diff --git
a/libmemcached/allocators.h
b/libmemcached/allocators.h
index 30ed382156d1a2bc01301ecd2174f70a349e7b0f..b525e9016cbdf16799dadf4ee6986640e553a603 100644
(file)
--- a/
libmemcached/allocators.h
+++ b/
libmemcached/allocators.h
@@
-9,8
+9,8
@@
*
*/
*
*/
-#ifndef __MEMCACHED_ALLOCATORS_H__
-#define __MEMCACHED_ALLOCATORS_H__
+#ifndef __
LIB
MEMCACHED_ALLOCATORS_H__
+#define __
LIB
MEMCACHED_ALLOCATORS_H__
#ifdef __cplusplus
extern "C" {
#ifdef __cplusplus
extern "C" {
@@
-21,7
+21,8
@@
memcached_return_t memcached_set_memory_allocators(memcached_st *ptr,
memcached_malloc_fn mem_malloc,
memcached_free_fn mem_free,
memcached_realloc_fn mem_realloc,
memcached_malloc_fn mem_malloc,
memcached_free_fn mem_free,
memcached_realloc_fn mem_realloc,
- memcached_calloc_fn mem_calloc);
+ memcached_calloc_fn mem_calloc,
+ void *context);
LIBMEMCACHED_API
void memcached_get_memory_allocators(const memcached_st *ptr,
LIBMEMCACHED_API
void memcached_get_memory_allocators(const memcached_st *ptr,
@@
-30,21
+31,26
@@
void memcached_get_memory_allocators(const memcached_st *ptr,
memcached_realloc_fn *mem_realloc,
memcached_calloc_fn *mem_calloc);
memcached_realloc_fn *mem_realloc,
memcached_calloc_fn *mem_calloc);
+LIBMEMCACHED_API
+void *memcached_get_memory_allocators_context(const memcached_st *ptr);
+
LIBMEMCACHED_LOCAL
LIBMEMCACHED_LOCAL
-void
libmemcached_free(const memcached_st *ptr, void *mem
);
+void
_libmemcached_free(const memcached_st *ptr, void *mem, void *context
);
LIBMEMCACHED_LOCAL
LIBMEMCACHED_LOCAL
-void *
libmemcached_malloc(const memcached_st *ptr, const size_t size
);
+void *
_libmemcached_malloc(const memcached_st *ptr, const size_t size, void *context
);
LIBMEMCACHED_LOCAL
LIBMEMCACHED_LOCAL
-void *
libmemcached_realloc(const memcached_st *ptr, void *mem, const size_t size
);
+void *
_libmemcached_realloc(const memcached_st *ptr, void *mem, const size_t size, void *context
);
LIBMEMCACHED_LOCAL
LIBMEMCACHED_LOCAL
-void *
libmemcached_calloc(const memcached_st *ptr, size_t nelem, size_t size
);
+void *
_libmemcached_calloc(const memcached_st *ptr, size_t nelem, size_t size, void *context
);
+LIBMEMCACHED_LOCAL
+struct _allocators_st memcached_allocators_return_default(void);
#ifdef __cplusplus
}
#endif
#ifdef __cplusplus
}
#endif
-#endif /* __MEMCACHED_ALLOCATORS_H__ */
+#endif /* __
LIB
MEMCACHED_ALLOCATORS_H__ */