log rebuilding, random refactoring, work in progress please wait for an OK commit...

[redis.git] / config.h

diff --git a/config.h b/config.h
index 79240b754030104e92d66741e9525a315ba9f53e..af73389559f185992495999b512336d5cce004a1 100644 (file)
--- a/config.h
+++ b/config.h
@@ -1,15 +1,19 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-/* malloc_size() */
+#ifdef __APPLE__
+#include <AvailabilityMacros.h>
+#endif
+
+/* test for malloc_size() */
 #ifdef __APPLE__
 #include <malloc/malloc.h>
-#define HAVE_MALLOC_SIZE
+#define HAVE_MALLOC_SIZE 1
 #define redis_malloc_size(p) malloc_size(p)
 #endif
 
 /* define redis_fstat to fstat or fstat64() */
-#ifdef __APPLE__
+#if defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)
 #define redis_fstat fstat64
 #define redis_stat stat64
 #else
@@ -17,4 +21,14 @@
 #define redis_stat stat
 #endif
 
+/* test for backtrace() */
+#if defined(__APPLE__) || defined(__linux__)
+#define HAVE_BACKTRACE 1
+#endif
+
+/* test for polling API */
+#ifdef __linux__
+#define HAVE_EPOLL 1
+#endif
+
 #endif