Software / code / prosody
Changeset
7791:8efd51667622
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 19 Dec 2016 09:34:40 +0100 |
| parents | 7788:cf1d7e35a160 (current diff) 7790:0310ab4f277f (diff) |
| children | 7794:424bbbeb9257 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Thu Dec 15 13:24:53 2016 +0100 +++ b/Makefile Mon Dec 19 09:34:40 2016 +0100 @@ -19,7 +19,7 @@ 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
--- a/util-src/pposix.c Thu Dec 15 13:24:53 2016 +0100 +++ b/util-src/pposix.c Mon Dec 19 09:34:40 2016 +0100 @@ -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
