A few small BSD related fixes.

diff --git a/runtest b/runtest
index 2ea4d39bec5db0e27f186be42357f25127528b8e..0eb384c24dc47df446dd8da3960dbbaaf284a863 100755 (executable)
--- a/runtest
+++ b/runtest
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh

 TCL=tclsh8.5
 which $TCL
 if [ "$?" != "0" ]
 TCL=tclsh8.5
 which $TCL
 if [ "$?" != "0" ]

diff --git a/src/Makefile b/src/Makefile
index 659d1d7fa34fd3692169b3fb26a73a6105fab24b..a6515e614fd8ea4ada9cb398c17de09fd80b52b6 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -175,7 +175,7 @@ else
 endif
 
 .make-arch:
 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
        -(echo $(ARCH) > .make-arch)
 
 # Clean local objects when allocator changes

diff --git a/src/ae.c b/src/ae.c
index 4c8aff9b0011034baaa5513a9d6bf3e234c2e162..4099b12598f4ea2a740590a86d44f30b183bb948 100644 (file)
--- a/src/ae.c
+++ b/src/ae.c
@@ -35,6 +35,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdlib.h>

+#include <string.h>

 
 #include "ae.h"
 #include "zmalloc.h"
 
 #include "ae.h"
 #include "zmalloc.h"

diff --git a/src/debug.c b/src/debug.c
index 54920032fd891262edec0fdacb8f0ac381366b7f..fe21531ba51ad35a673871d4ba7835bda58a9f3e 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -389,6 +389,14 @@ void _redisPanic(char *msg, char *file, int line) {
 #endif
 }
 
 #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__)
 #ifdef HAVE_BACKTRACE
 static void *getMcontextEip(ucontext_t *uc) {
 #if defined(__FreeBSD__)


@@ -420,14 +428,6 @@ static void *getMcontextEip(ucontext_t *uc) {
 #endif
 }
 
 #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--) {
 void logStackContent(void **sp) {
     int i;
     for (i = 15; i >= 0; i--) {