@@ -1,6 +1,10 @@ #ifndef __CONFIG_H #define __CONFIG_H +#ifdef __APPLE__ +#include <AvailabilityMacros.h> +#endif + /* test for malloc_size() */ #ifdef __APPLE__ #include <malloc/malloc.h> @@ -9,7 +13,7 @@ #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 config.h @@ -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; -#elif defined(__APPLE__) +#elif defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6) 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 */ redis.c fbf9bcdb6f87d4c9c50d050803c39a139eec35fb antirez antirez@gmail.com http://github.com/antirez/redis/commit/06db1f50cd754995130ece657a39d534b82d14ae 06db1f50cd754995130ece657a39d534b82d14ae 2009-07-24T05:32:58-07:00 2009-07-24T05:32:58-07:00 fixed compilation with Snow Leopard, thanks to Lon Baker for providing SSH access to Snow Leopard box 5c2af40f246def2ba108a4cfc2d9e26d7f48796b antirez antirez@gmail.com