Merge -r292683 Share the php_sockets.h header (mkoppanen)

diff --git a/ext/sockets/config.m4 b/ext/sockets/config.m4
index 91dda989c83af507518027eb2a93049442dcc765..574548d60575e809edfaab99f0351a0a991e3145 100644 (file)
--- a/ext/sockets/config.m4
+++ b/ext/sockets/config.m4
@@ -29,4 +29,5 @@ if test "$PHP_SOCKETS" != "no"; then
   AC_DEFINE([HAVE_SOCKETS], 1, [ ])
 
   PHP_NEW_EXTENSION([sockets], [sockets.c], [$ext_shared])
+  PHP_INSTALL_HEADERS([ext/sockets/], [php_sockets.h])
 fi

diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h
index 05c04d6ab727e86cc366d021541a26c9507f3040..591d10c7ced50faa3d32f5588f1b2b725400e1fa 100644 (file)
--- a/ext/sockets/php_sockets.h
+++ b/ext/sockets/php_sockets.h
@@ -95,6 +95,8 @@ struct        sockaddr_un {
 
 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);

diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index b668a594912b0e39ba3734b342f754a449859c50..82157f3e1038c643e87c533d1efd2813162fed7d 100644 (file)
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -110,7 +110,7 @@ static char *php_strerror(int error TSRMLS_DC);
                                                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)