com php-src: Fix ext/sockets build with phpize: ext/sockets/multicast.c ext/sockets/php_sockets.h ext/sockets/sockets.c

Commit: 189fbfd53b087099689b9198407ee0c50b17fc61 Author: Gustavo Lopes <glopes@nebm.ist.utl.pt> Sun, 24 Feb 2013 00:47:44 +0100 Parents: 97f22702c4b3af574049160f20982d1e38424296 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=189fbfd53b087099689b9198407ee0c50b17fc61 Log: Fix ext/sockets build with phpize Fixes bug #64285 Bugs: https://bugs.php.net/64285 Changed paths: M ext/sockets/multicast.c M ext/sockets/php_sockets.h M ext/sockets/sockets.c Diff: diff --git a/ext/sockets/multicast.c b/ext/sockets/multicast.c index 94f845d..7466c62 100644 --- a/ext/sockets/multicast.c +++ b/ext/sockets/multicast.c @@ -24,8 +24,6 @@ #include "php.h" -#if HAVE_SOCKETS - #include "php_network.h" #ifdef PHP_WIN32 # include "windows_common.h" @@ -836,5 +834,3 @@ err: return FAILURE; } #endif - -#endif /* HAVE_SOCKETS */ diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h index dd2b993..17abf95 100644 --- a/ext/sockets/php_sockets.h +++ b/ext/sockets/php_sockets.h @@ -24,6 +24,10 @@ /* $Id$ */ +#if HAVE_CONFIG_H +# include "config.h" +#endif + #if HAVE_SOCKETS #include <php.h> diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index 7f5d49e..5ecc014 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -28,8 +28,6 @@ #include "php.h" -#if HAVE_SOCKETS - #include "php_network.h" #include "ext/standard/file.h" #include "ext/standard/info.h" @@ -2278,8 +2276,6 @@ PHP_FUNCTION(socket_import_stream) } /* }}} */ -#endif - /* * Local variables: * tab-width: 4