Merge default into minor

--HG--
branch : minor

src/libraries/enet/libenet/unix.c

@@ -54,6 +54,7 @@
 #include <sys/poll.h>
 #endif
 
+#include "common/config.h"
 #ifndef HAS_SOCKLEN_T
 typedef int socklen_t;
 #endif