[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/sockets/php_sockets.h branches/PHP_5_3/ext/sockets/sockets.c trunk/ext/sockets/php_sockets.h trunk/ext/sockets/sockets.c
pajoye Fri, 04 Sep 2009 19:53:39 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288067
Log:
- #49464, fix build
Bug: http://bugs.php.net/49464 (Open) php_sockets build broken
Changed paths:
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/php_sockets.h
U php/php-src/trunk/ext/sockets/sockets.c
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-09-04
19:36:02 UTC (rev 288066)
+++ php/php-src/branches/PHP_5_3/ext/sockets/php_sockets.h 2009-09-04
19:53:39 UTC (rev 288067)
@@ -73,7 +73,9 @@
#ifndef PHP_WIN32
typedef int PHP_SOCKET;
+# define PHP_SOCKETS_API PHPAPI
#else
+# define PHP_SOCKETS_API __declspec(dllexport)
typedef SOCKET PHP_SOCKET;
#endif
@@ -91,7 +93,7 @@
};
#endif
-PHPAPI int php_sockets_le_socket(void);
+PHP_SOCKETS_API int php_sockets_le_socket(void);
/* Prototypes */
#ifdef ilia_0 /* not needed, only causes a compiler warning */
Modified: php/php-src/branches/PHP_5_3/ext/sockets/sockets.c
===
--- php/php-src/branches/PHP_5_3/ext/sockets/sockets.c 2009-09-04 19:36:02 UTC
(rev 288066)
+++ php/php-src/branches/PHP_5_3/ext/sockets/sockets.c 2009-09-04 19:53:39 UTC
(rev 288067)
@@ -323,7 +323,7 @@
/* inet_ntop should be used instead of inet_ntoa */
int inet_ntoa_lock = 0;
-PHPAPI int php_sockets_le_socket(void) /* {{{ */
+PHP_SOCKETS_API int php_sockets_le_socket(void) /* {{{ */
{
return le_socket;
}
Modified: php/php-src/trunk/ext/sockets/php_sockets.h
===
--- php/php-src/trunk/ext/sockets/php_sockets.h 2009-09-04 19:36:02 UTC (rev
288066)
+++ php/php-src/trunk/ext/sockets/php_sockets.h 2009-09-04 19:53:39 UTC (rev
288067)
@@ -73,8 +73,10 @@
#ifndef PHP_WIN32
typedef int PHP_SOCKET;
+# define PHP_SOCKETS_API __declspec(dllexport)
#else
typedef SOCKET PHP_SOCKET;
+# define PHP_SOCKETS_API PHPAPI
#endif
typedef struct {
@@ -91,7 +93,7 @@
};
#endif
-PHPAPI int php_sockets_le_socket(void);
+PHP_SOCKETS_API int php_sockets_le_socket(void);
/* Prototypes */
#ifdef ilia_0 /* not needed, only causes a compiler warning */
Modified: php/php-src/trunk/ext/sockets/sockets.c
===
--- php/php-src/trunk/ext/sockets/sockets.c 2009-09-04 19:36:02 UTC (rev
288066)
+++ php/php-src/trunk/ext/sockets/sockets.c 2009-09-04 19:53:39 UTC (rev
288067)
@@ -323,7 +323,8 @@
/* inet_ntop should be used instead of inet_ntoa */
int inet_ntoa_lock = 0;
-PHPAPI int php_sockets_le_socket(void) /* {{{ */
+
+PHP_SOCKETS_API int php_sockets_le_socket(void) /* {{{ */
{
return le_socket;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/sockets/php_sockets.h branches/PHP_5_3/ext/sockets/sockets.c trunk/ext/sockets/php_sockets.h trunk/ext/sockets/sockets.c
tony2001 Mon, 31 Aug 2009 08:41:03 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=287911
Log:
export le_socket from ext/sockets
Changed paths:
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/php_sockets.h
U php/php-src/trunk/ext/sockets/sockets.c
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-08-31
08:12:07 UTC (rev 287910)
+++ php/php-src/branches/PHP_5_3/ext/sockets/php_sockets.h 2009-08-31
08:41:03 UTC (rev 287911)
@@ -91,6 +91,8 @@
};
#endif
+PHPAPI int php_sockets_le_socket(void);
+
/* 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-08-31 08:12:07 UTC
(rev 287910)
+++ php/php-src/branches/PHP_5_3/ext/sockets/sockets.c 2009-08-31 08:41:03 UTC
(rev 287911)
@@ -323,6 +323,12 @@
/* inet_ntop should be used instead of inet_ntoa */
int inet_ntoa_lock = 0;
+PHPAPI int php_sockets_le_socket(void) /* {{{ */
+{
+ return le_socket;
+}
+/* }}} */
+
static void php_destroy_socket(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
{
php_socket *php_sock = (php_socket *) rsrc-ptr;
Modified: php/php-src/trunk/ext/sockets/php_sockets.h
===
--- php/php-src/trunk/ext/sockets/php_sockets.h 2009-08-31 08:12:07 UTC (rev
287910)
+++ php/php-src/trunk/ext/sockets/php_sockets.h 2009-08-31 08:41:03 UTC (rev
287911)
@@ -91,6 +91,8 @@
};
#endif
+PHPAPI int php_sockets_le_socket(void);
+
/* 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-08-31 08:12:07 UTC (rev
287910)
+++ php/php-src/trunk/ext/sockets/sockets.c 2009-08-31 08:41:03 UTC (rev
287911)
@@ -323,6 +323,12 @@
/* inet_ntop should be used instead of inet_ntoa */
int inet_ntoa_lock = 0;
+PHPAPI int php_sockets_le_socket(void) /* {{{ */
+{
+ return le_socket;
+}
+/* }}} */
+
static void php_destroy_socket(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
{
php_socket *php_sock = (php_socket *) rsrc-ptr;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
