johannes Mon, 25 Jan 2010 23:12:42 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=294029
Log: Merge -r292683 Share the php_sockets.h header (mkoppanen) Changed paths: _U php/php-src/branches/PHP_5_3_2/ U php/php-src/branches/PHP_5_3_2/ext/sockets/config.m4 U php/php-src/branches/PHP_5_3_2/ext/sockets/php_sockets.h U php/php-src/branches/PHP_5_3_2/ext/sockets/sockets.c Property changes on: php/php-src/branches/PHP_5_3_2 ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682,292693,292719,292765 /php/php-src/trunk:284726 + /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292765 /php/php-src/trunk:284726 Modified: php/php-src/branches/PHP_5_3_2/ext/sockets/config.m4 =================================================================== --- php/php-src/branches/PHP_5_3_2/ext/sockets/config.m4 2010-01-25 23:09:11 UTC (rev 294028) +++ php/php-src/branches/PHP_5_3_2/ext/sockets/config.m4 2010-01-25 23:12:42 UTC (rev 294029) @@ -29,4 +29,5 @@ AC_DEFINE([HAVE_SOCKETS], 1, [ ]) PHP_NEW_EXTENSION([sockets], [sockets.c], [$ext_shared]) + PHP_INSTALL_HEADERS([ext/sockets/], [php_sockets.h]) fi Modified: php/php-src/branches/PHP_5_3_2/ext/sockets/php_sockets.h =================================================================== --- php/php-src/branches/PHP_5_3_2/ext/sockets/php_sockets.h 2010-01-25 23:09:11 UTC (rev 294028) +++ php/php-src/branches/PHP_5_3_2/ext/sockets/php_sockets.h 2010-01-25 23:12:42 UTC (rev 294029) @@ -95,6 +95,8 @@ PHP_SOCKETS_API int php_sockets_le_socket(void); +#define php_sockets_le_socket_name "Socket" + /* Prototypes */ #ifdef ilia_0 /* not needed, only causes a compiler warning */ static int php_open_listen_sock(php_socket **php_sock, int port, int backlog TSRMLS_DC); Modified: php/php-src/branches/PHP_5_3_2/ext/sockets/sockets.c =================================================================== --- php/php-src/branches/PHP_5_3_2/ext/sockets/sockets.c 2010-01-25 23:09:11 UTC (rev 294028) +++ php/php-src/branches/PHP_5_3_2/ext/sockets/sockets.c 2010-01-25 23:12:42 UTC (rev 294029) @@ -110,7 +110,7 @@ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s [%d]: %s", msg, errn, php_strerror(errn TSRMLS_CC)) static int le_socket; -#define le_socket_name "Socket" +#define le_socket_name php_sockets_le_socket_name /* {{{ arginfo */ ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_select, 0, 0, 4)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php