diff options
author | antirez <antirez@gmail.com> | 2012-02-08 22:24:59 +0100 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2012-02-08 22:24:59 +0100 |
commit | ac834d237a1b094eecd6ac2f36aa47b52b49466f (patch) | |
tree | abad6c0418275dff655108c8ccbfd9756596fe45 | |
parent | 01e95705f8d4b0d21cf892748eaf153f16fbf947 (diff) | |
download | redis-ac834d237a1b094eecd6ac2f36aa47b52b49466f.tar.gz |
A few small BSD related fixes.
-rwxr-xr-x | runtest | 2 | ||||
-rw-r--r-- | src/Makefile | 2 | ||||
-rw-r--r-- | src/ae.c | 1 | ||||
-rw-r--r-- | src/debug.c | 16 |
4 files changed, 11 insertions, 10 deletions
@@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh TCL=tclsh8.5 which $TCL if [ "$?" != "0" ] diff --git a/src/Makefile b/src/Makefile index 659d1d7fa..a6515e614 100644 --- a/src/Makefile +++ b/src/Makefile @@ -175,7 +175,7 @@ else endif .make-arch: - -(cd ../deps && make $(DEPENDENCY_TARGETS) ARCH="$(ARCH)") + -(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS) ARCH="$(ARCH)") -(echo $(ARCH) > .make-arch) # Clean local objects when allocator changes @@ -35,6 +35,7 @@ #include <sys/types.h> #include <unistd.h> #include <stdlib.h> +#include <string.h> #include "ae.h" #include "zmalloc.h" diff --git a/src/debug.c b/src/debug.c index 54920032f..fe21531ba 100644 --- a/src/debug.c +++ b/src/debug.c @@ -389,6 +389,14 @@ void _redisPanic(char *msg, char *file, int line) { #endif } +void bugReportStart(void) { + if (server.bug_report_start == 0) { + redisLog(REDIS_WARNING, + "\n\n=== REDIS BUG REPORT START: Cut & paste starting from here ==="); + server.bug_report_start = 1; + } +} + #ifdef HAVE_BACKTRACE static void *getMcontextEip(ucontext_t *uc) { #if defined(__FreeBSD__) @@ -420,14 +428,6 @@ static void *getMcontextEip(ucontext_t *uc) { #endif } -void bugReportStart(void) { - if (server.bug_report_start == 0) { - redisLog(REDIS_WARNING, - "\n\n=== REDIS BUG REPORT START: Cut & paste starting from here ==="); - server.bug_report_start = 1; - } -} - void logStackContent(void **sp) { int i; for (i = 15; i >= 0; i--) { |