From: Gustavo Lopes <glopes@nebm.ist.utl.pt>
Date: Thu, 31 Jan 2013 15:24:02 +0000 (+0100)
Subject: Fix non-Windows build
X-Git-Tag: php-5.5.0alpha5~43^2~11^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=608254fa5757ee07999d5c4bec660b8c29780938;p=php

Fix non-Windows build
---

diff --git a/ext/sockets/conversions.c b/ext/sockets/conversions.c
index 6c79166806..e3ff271f84 100644
--- a/ext/sockets/conversions.c
+++ b/ext/sockets/conversions.c
@@ -1,7 +1,9 @@
 #include "sockaddr_conv.h"
 #include "conversions.h"
 #include "sendrecvmsg.h" /* for ancillary registry */
-#include "windows_common.h"
+#ifdef PHP_WIN32
+# include "windows_common.h"
+#endif
 
 #include <Zend/zend_llist.h>
 #include <ext/standard/php_smart_str.h>
diff --git a/main/php_network.h b/main/php_network.h
index 8ffb51ca40..c1535ee040 100644
--- a/main/php_network.h
+++ b/main/php_network.h
@@ -21,6 +21,8 @@
 #ifndef _PHP_NETWORK_H
 #define _PHP_NETWORK_H
 
+#include <php.h>
+
 #ifdef PHP_WIN32
 # include "win32/inet.h"
 #else