fixed compilation with Snow Leopard, thanks to Lon Baker for providing SSH access...

diff --git a/config.h b/config.h
index 52f1afdb793e12d341d5e9ae43b2da8a3762923d..c19cfc74bedc98cc2f4be45027bccd4d6563b1ea 100644 (file)
--- a/config.h
+++ b/config.h
@@ -1,6 +1,10 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 

+#ifdef __APPLE__
+#include <AvailabilityMacros.h>
+#endif
+

 /* test for malloc_size() */
 #ifdef __APPLE__
 #include <malloc/malloc.h>
 /* test for malloc_size() */
 #ifdef __APPLE__
 #include <malloc/malloc.h>


@@ -9,7 +13,7 @@
 #endif
 
 /* define redis_fstat to fstat or fstat64() */
 #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
 #define redis_fstat fstat64
 #define redis_stat stat64
 #else

diff --git a/redis.c b/redis.c
index 0dfc36d9a66f68da0897f5436dff0b2f4979723e..a14cae802fbe3de405c01133b5d0e7fcad88b62e 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -4305,8 +4305,10 @@ static void *getMcontextEip(ucontext_t *uc) {
     return (void*) uc->uc_mcontext.mc_eip;
 #elif defined(__dietlibc__)
     return (void*) uc->uc_mcontext.eip;
     return (void*) uc->uc_mcontext.mc_eip;
 #elif defined(__dietlibc__)
     return (void*) uc->uc_mcontext.eip;

-#elif defined(__APPLE__)
+#elif defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)

     return (void*) uc->uc_mcontext->__ss.__eip;
     return (void*) uc->uc_mcontext->__ss.__eip;

+#elif defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_6)
+    return (void*) uc->uc_mcontext->__ss.__rip;

 #elif defined(__i386__) || defined(__X86_64__) /* Linux x86 */
     return (void*) uc->uc_mcontext.gregs[REG_EIP];
 #elif defined(__ia64__) /* Linux IA64 */
 #elif defined(__i386__) || defined(__X86_64__) /* Linux x86 */
     return (void*) uc->uc_mcontext.gregs[REG_EIP];
 #elif defined(__ia64__) /* Linux IA64 */