mkoppanen Sun, 27 Dec 2009 01:00:50 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=292683
Log: Share the php_sockets.h header Share php_sockets_le_socket_name Changed paths: U php/php-src/branches/PHP_5_3/ext/sockets/config.m4 U php/php-src/branches/PHP_5_3/ext/sockets/php_sockets.h U php/php-src/branches/PHP_5_3/ext/sockets/sockets.c U php/php-src/trunk/ext/sockets/config.m4 U php/php-src/trunk/ext/sockets/php_sockets.h U php/php-src/trunk/ext/sockets/sockets.c Modified: php/php-src/branches/PHP_5_3/ext/sockets/config.m4 =================================================================== --- php/php-src/branches/PHP_5_3/ext/sockets/config.m4 2009-12-27 00:43:33 UTC (rev 292682) +++ php/php-src/branches/PHP_5_3/ext/sockets/config.m4 2009-12-27 01:00:50 UTC (rev 292683) @@ -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/ext/sockets/php_sockets.h =================================================================== --- php/php-src/branches/PHP_5_3/ext/sockets/php_sockets.h 2009-12-27 00:43:33 UTC (rev 292682) +++ php/php-src/branches/PHP_5_3/ext/sockets/php_sockets.h 2009-12-27 01:00:50 UTC (rev 292683) @@ -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/ext/sockets/sockets.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/sockets/sockets.c 2009-12-27 00:43:33 UTC (rev 292682) +++ php/php-src/branches/PHP_5_3/ext/sockets/sockets.c 2009-12-27 01:00:50 UTC (rev 292683) @@ -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) Modified: php/php-src/trunk/ext/sockets/config.m4 =================================================================== --- php/php-src/trunk/ext/sockets/config.m4 2009-12-27 00:43:33 UTC (rev 292682) +++ php/php-src/trunk/ext/sockets/config.m4 2009-12-27 01:00:50 UTC (rev 292683) @@ -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/trunk/ext/sockets/php_sockets.h =================================================================== --- php/php-src/trunk/ext/sockets/php_sockets.h 2009-12-27 00:43:33 UTC (rev 292682) +++ php/php-src/trunk/ext/sockets/php_sockets.h 2009-12-27 01:00:50 UTC (rev 292683) @@ -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/trunk/ext/sockets/sockets.c =================================================================== --- php/php-src/trunk/ext/sockets/sockets.c 2009-12-27 00:43:33 UTC (rev 292682) +++ php/php-src/trunk/ext/sockets/sockets.c 2009-12-27 01:00:50 UTC (rev 292683) @@ -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