From da0a1620771c54bb67cdef46dae40f005133b8d1 Mon Sep 17 00:00:00 2001 From: antirez Date: Tue, 1 Dec 2009 11:53:00 +0100 Subject: [PATCH] compilation problem on 64bit mac os x 10.5 possibly fixed --- redis.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/redis.c b/redis.c index fb3947b76..627c4cf13 100644 --- a/redis.c +++ b/redis.c @@ -806,7 +806,7 @@ static dictType zsetDictType = { NULL, /* val dup */ dictEncObjKeyCompare, /* key compare */ dictRedisObjectDestructor, /* key destructor */ - dictVanillaFree /* val destructor */ + dictVanillaFree /* val destructor of malloc(sizeof(double)) */ }; static dictType hashDictType = { @@ -6219,7 +6219,11 @@ static void *getMcontextEip(ucontext_t *uc) { #elif defined(__dietlibc__) return (void*) uc->uc_mcontext.eip; #elif defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6) + #if __x86_64__ + return (void*) uc->uc_mcontext->__ss.__rip; + #else return (void*) uc->uc_mcontext->__ss.__eip; + #endif #elif defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_6) #if defined(_STRUCT_X86_THREAD_STATE64) && !defined(__i386__) return (void*) uc->uc_mcontext->__ss.__rip;