From: Johannes Schlüter <johannes@php.net>
Date: Mon, 25 Jan 2010 23:12:42 +0000 (+0000)
Subject: Merge -r292683 Share the php_sockets.h header (mkoppanen)
X-Git-Tag: php-5.3.2RC2~101
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=acaa7fd01d347ce66e270b168476c462cd923127;p=php

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

diff --git a/ext/sockets/config.m4 b/ext/sockets/config.m4
index 91dda989c8..574548d605 100644
--- 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 05c04d6ab7..591d10c7ce 100644
--- 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 b668a59491..82157f3e10 100644
--- 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)