Commit da0a1620 authored by antirez's avatar antirez
Browse files

compilation problem on 64bit mac os x 10.5 possibly fixed

parent 380bf080
...@@ -806,7 +806,7 @@ static dictType zsetDictType = { ...@@ -806,7 +806,7 @@ static dictType zsetDictType = {
NULL, /* val dup */ NULL, /* val dup */
dictEncObjKeyCompare, /* key compare */ dictEncObjKeyCompare, /* key compare */
dictRedisObjectDestructor, /* key destructor */ dictRedisObjectDestructor, /* key destructor */
dictVanillaFree /* val destructor */ dictVanillaFree /* val destructor of malloc(sizeof(double)) */
}; };
static dictType hashDictType = { static dictType hashDictType = {
...@@ -6219,7 +6219,11 @@ static void *getMcontextEip(ucontext_t *uc) { ...@@ -6219,7 +6219,11 @@ static void *getMcontextEip(ucontext_t *uc) {
#elif defined(__dietlibc__) #elif defined(__dietlibc__)
return (void*) uc->uc_mcontext.eip; return (void*) uc->uc_mcontext.eip;
#elif defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6) #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; return (void*) uc->uc_mcontext->__ss.__eip;
#endif
#elif defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_6) #elif defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_6)
#if defined(_STRUCT_X86_THREAD_STATE64) && !defined(__i386__) #if defined(_STRUCT_X86_THREAD_STATE64) && !defined(__i386__)
return (void*) uc->uc_mcontext->__ss.__rip; return (void*) uc->uc_mcontext->__ss.__rip;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment