From 4bacd7b4fc1ccdfc5c5257d3683137c81569da87 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 19 Dec 2016 08:51:50 +0100 Subject: util.pposix: rfork() seems to be FreeBSD only (fixes #412) --- util-src/pposix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util-src/pposix.c b/util-src/pposix.c index b48465d3..7037730f 100644 --- a/util-src/pposix.c +++ b/util-src/pposix.c @@ -49,9 +49,9 @@ #define WITH_MALLINFO #endif -#if defined(RFPROC) && defined(EV_SET) +#if defined(__FreeBSD__) && defined(RFPROC) /* - * On *BSD, calling fork() is equivalent to rfork(RFPROC | RFFDG). + * On FreeBSD, calling fork() is equivalent to rfork(RFPROC | RFFDG). * * RFFDG being set means that the file descriptor table is copied, * otherwise it's shared. We want the later, otherwise libevent gets -- cgit v1.2.3 From 8fa3305358309eb79f24c66bb08555ae5e785efa Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 19 Dec 2016 09:32:43 +0100 Subject: Makefile: Add 'test' to phony targets so `make test` runs tests even if a file 'test' exists --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8b6f99da..b814736a 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ INSTALL_EXEC=$(INSTALL) -m755 MKDIR=install -d MKDIR_PRIVATE=$(MKDIR) -m750 -.PHONY: all clean install +.PHONY: all test clean install all: prosody.install prosodyctl.install prosody.cfg.lua.install prosody.version $(MAKE) -C util-src install -- cgit v1.2.3