summaryrefslogtreecommitdiff
path: root/databases/redis/files
diff options
context:
space:
mode:
authorSergey A. Osokin <osa@FreeBSD.org>2011-12-02 03:42:56 +0000
committerSergey A. Osokin <osa@FreeBSD.org>2011-12-02 03:42:56 +0000
commitb3606b8da2c3bbf27395bf826a66cbaabec996d7 (patch)
tree3a8ebb3d98603f20cc9ad5d86519dad0c63f6380 /databases/redis/files
parent- Update to 2.4.9 (diff)
Fix build on i386.
Feature safe: yes PR: 163004
Notes
Notes: svn path=/head/; revision=286753
Diffstat (limited to 'databases/redis/files')
-rw-r--r--databases/redis/files/patch-src::redis.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/databases/redis/files/patch-src::redis.c b/databases/redis/files/patch-src::redis.c
index de70ed4dd257..87f2777936ff 100644
--- a/databases/redis/files/patch-src::redis.c
+++ b/databases/redis/files/patch-src::redis.c
@@ -1,11 +1,15 @@
---- src/redis.c.orig 2011-11-30 16:29:38.000000000 +0400
-+++ src/redis.c 2011-11-30 16:29:59.000000000 +0400
-@@ -1685,7 +1685,7 @@
+--- src/redis.c.orig 2011-11-28 14:22:08.000000000 +0400
++++ src/redis.c 2011-12-02 06:23:15.000000000 +0400
+@@ -1685,7 +1685,11 @@
#ifdef HAVE_BACKTRACE
static void *getMcontextEip(ucontext_t *uc) {
#if defined(__FreeBSD__)
- return (void*) uc->uc_mcontext.mc_eip;
++ #if __x86_64__
+ return (void*) uc->uc_mcontext.mc_rip;
++ #elif __i386__
++ return (void*) uc->uc_mcontext.mc_eip;
++ #endif
#elif defined(__dietlibc__)
return (void*) uc->uc_mcontext.eip;
#elif defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)