Skip to content

Commit ac834d2

Browse files
committed
A few small BSD related fixes.
1 parent 01e9570 commit ac834d2

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

runtest

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/bin/sh
22
TCL=tclsh8.5
33
which $TCL
44
if [ "$?" != "0" ]

src/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ else
175175
endif
176176

177177
.make-arch:
178-
-(cd ../deps && make $(DEPENDENCY_TARGETS) ARCH="$(ARCH)")
178+
-(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS) ARCH="$(ARCH)")
179179
-(echo $(ARCH) > .make-arch)
180180

181181
# Clean local objects when allocator changes

src/ae.c

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include <sys/types.h>
3636
#include <unistd.h>
3737
#include <stdlib.h>
38+
#include <string.h>
3839

3940
#include "ae.h"
4041
#include "zmalloc.h"

src/debug.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,14 @@ void _redisPanic(char *msg, char *file, int line) {
389389
#endif
390390
}
391391

392+
void bugReportStart(void) {
393+
if (server.bug_report_start == 0) {
394+
redisLog(REDIS_WARNING,
395+
"\n\n=== REDIS BUG REPORT START: Cut & paste starting from here ===");
396+
server.bug_report_start = 1;
397+
}
398+
}
399+
392400
#ifdef HAVE_BACKTRACE
393401
static void *getMcontextEip(ucontext_t *uc) {
394402
#if defined(__FreeBSD__)
@@ -420,14 +428,6 @@ static void *getMcontextEip(ucontext_t *uc) {
420428
#endif
421429
}
422430

423-
void bugReportStart(void) {
424-
if (server.bug_report_start == 0) {
425-
redisLog(REDIS_WARNING,
426-
"\n\n=== REDIS BUG REPORT START: Cut & paste starting from here ===");
427-
server.bug_report_start = 1;
428-
}
429-
}
430-
431431
void logStackContent(void **sp) {
432432
int i;
433433
for (i = 15; i >= 0; i--) {

0 commit comments

Comments
 (0)