Merge branch 'master' into dev

2016-07-21 19:07:50 -07:00 · 2016-07-21 19:07:50 -07:00 · faf864b8a2
commit faf864b8a2
parent 10564d8e14 8a23d764de
10 changed files with 91 additions and 97 deletions
--- a/ext/libnatpmp/getgateway.c
+++ b/ext/libnatpmp/getgateway.c
@ -96,7 +96,6 @@ POSSIBILITY OF SUCH DAMAGE.

 #ifdef USE_SYSCTL_NET_ROUTE
 #include <stdlib.h>
-#include <sys/sysctl.h>
 #include <sys/socket.h>
 #include <net/route.h>
 #endif