diff options
| author | Kim Alvefur <zash@zash.se> | 2016-12-19 09:34:40 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-12-19 09:34:40 +0100 |
| commit | 1aa0b3a4baeadbf016e8da7c494d2c2233c754f1 (patch) | |
| tree | 22c3bd86a1b1249c79c21e3f12989991ef540d33 | |
| parent | e920776f1d7ab7e0ea1e5d9eadbc7041cac38334 (diff) | |
| parent | 8fa3305358309eb79f24c66bb08555ae5e785efa (diff) | |
| download | prosody-1aa0b3a4baeadbf016e8da7c494d2c2233c754f1.tar.gz prosody-1aa0b3a4baeadbf016e8da7c494d2c2233c754f1.zip | |
Merge 0.10->trunk
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | util-src/pposix.c | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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 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 |