com php-src: Fix non-Windows build: ext/sockets/conversions.c main/php_network.h
| From: | Gustavo André dos Santos Lopes | Date: | Sat, 02 Feb 2013 15:38:09 +0000 |
| Subject: | com php-src: Fix non-Windows build: ext/sockets/conversions.c main/php_network.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71117@lists.php.net to get a copy of this message | ||
Commit: 608254fa5757ee07999d5c4bec660b8c29780938
Author: Gustavo Lopes <glopes@nebm.ist.utl.pt> Thu, 31 Jan 2013 16:24:02 +0100
Parents: 7066cc726713f0eaf79db9eac0da90bc6d8740b4
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=608254fa5757ee07999d5c4bec660b8c29780938
Log:
Fix non-Windows build
Changed paths:
M ext/sockets/conversions.c
M main/php_network.h
Diff:
diff --git a/ext/sockets/conversions.c b/ext/sockets/conversions.c
index 6c79166..e3ff271 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 8ffb51c..c1535ee 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