mirror of
https://github.com/fluencelabs/redis
synced 2025-04-05 01:01:04 +00:00
compilation problem on 64bit mac os x 10.5 possibly fixed
This commit is contained in:
parent
380bf0802a
commit
da0a162077
6
redis.c
6
redis.c
@ -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) {
|
|||||||
#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;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user