# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1482136480 -3600
# Node ID 8efd51667622cca48072580a885362eab3404182
# Parent  cf1d7e35a1602aeb3f4e84b28e378ce28d8d381e# Parent  0310ab4f277f2ab215ae02efd1283db8a6c3ef40
Merge 0.10->trunk

diff -r cf1d7e35a160 -r 8efd51667622 Makefile
--- 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
diff -r cf1d7e35a160 -r 8efd51667622 util-src/pposix.c
--- 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