Permalink
Browse files

A few small BSD related fixes.

  • Loading branch information...
1 parent 01e9570 commit ac834d237a1b094eecd6ac2f36aa47b52b49466f @antirez antirez committed Feb 8, 2012
Showing with 11 additions and 10 deletions.
  1. +1 −1 runtest
  2. +1 −1 src/Makefile
  3. +1 −0 src/ae.c
  4. +8 −8 src/debug.c
View
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
TCL=tclsh8.5
which $TCL
if [ "$?" != "0" ]
View
@@ -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
View
@@ -35,6 +35,7 @@
#include <sys/types.h>
#include <unistd.h>
#include <stdlib.h>
+#include <string.h>
#include "ae.h"
#include "zmalloc.h"
View
@@ -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--) {

0 comments on commit ac834d2

Please sign in to comment.