Merge branch 'master' of git@github.com:antirez/redis

[redis.git] / zmalloc.h

diff --git a/zmalloc.h b/zmalloc.h
index 9e70e8778c5a46c3821a42ce51ec2d78ab4cb758..193e7eda5c04f6b7288a5f52b7dd35ac06c76ba1 100644 (file)
--- a/zmalloc.h
+++ b/zmalloc.h
@@ -1,6 +1,6 @@
 /* zmalloc - total amount of allocated memory aware version of malloc()
  *
- * Copyright (c) 2006-2009, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2010, Salvatore Sanfilippo <antirez at gmail dot com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,5 +36,6 @@ void *zrealloc(void *ptr, size_t size);
 void zfree(void *ptr);
 char *zstrdup(const char *s);
 size_t zmalloc_used_memory(void);
+void zmalloc_enable_thread_safeness(void);
 
 #endif /* _ZMALLOC_H */