[PHP-CVS] svn: /php/php-src/trunk/ext/mysqlnd/ config.w32
pajoye Wed, 30 Mar 2011 09:25:09 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=309839
Log:
- fix build
Changed paths:
U php/php-src/trunk/ext/mysqlnd/config.w32
Modified: php/php-src/trunk/ext/mysqlnd/config.w32
===
--- php/php-src/trunk/ext/mysqlnd/config.w322011-03-30 07:37:26 UTC (rev
309838)
+++ php/php-src/trunk/ext/mysqlnd/config.w322011-03-30 09:25:09 UTC (rev
309839)
@@ -7,10 +7,10 @@
if (CHECK_LIB(ws2_32.lib, mysqlnd)) {
mysqlnd_source =
mysqlnd.c +
- mysqlnd_alloc.c +
+ mysqlnd_alloc.c +
mysqlnd_auth.c +
mysqlnd_block_alloc.c +
- mysqlnd_bt.c +
+ mysqlnd_bt.c +
mysqlnd_charset.c +
mysqlnd_debug.c +
mysqlnd_loaddata.c +
@@ -22,7 +22,7 @@
mysqlnd_result_meta.c +
mysqlnd_statistics.c +
mysqlnd_wireprotocol.c +
- php_mysqlnd.c;
+ php_mysqlnd.c ;
EXTENSION(mysqlnd, mysqlnd_source, false);
if (((PHP_ZLIB==no) (CHECK_LIB(zlib_a.lib;zlib.lib,
mysqlnd, PHP_MYSQLND))) ||
(PHP_ZLIB_SHARED CHECK_LIB(zlib.lib, mysqlnd,
PHP_MYSQLND)) || (PHP_ZLIB == yes (!PHP_ZLIB_SHARED)))
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/sockets/ sockets.c
pajoye Wed, 30 Mar 2011 09:42:21 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=309840
Log:
- attempt to fix build, 1st error
Changed paths:
U php/php-src/trunk/ext/sockets/sockets.c
Modified: php/php-src/trunk/ext/sockets/sockets.c
===
--- php/php-src/trunk/ext/sockets/sockets.c 2011-03-30 09:25:09 UTC (rev
309839)
+++ php/php-src/trunk/ext/sockets/sockets.c 2011-03-30 09:42:21 UTC (rev
309840)
@@ -2437,7 +2437,7 @@
{
zval *zstream;
php_stream *stream;
- php_socket *retsock = NULL;;
+ php_socket *retsock = NULL;
PHP_SOCKET socket; /* fd */
php_sockaddr_storage addr;
socklen_taddr_len = sizeof(addr);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/sockets/ sockets.c
pajoye Wed, 30 Mar 2011 09:46:20 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=309841
Log:
- fix build, should fix that code too on non win (wondering if that part was
working at all)
Changed paths:
U php/php-src/trunk/ext/sockets/sockets.c
Modified: php/php-src/trunk/ext/sockets/sockets.c
===
--- php/php-src/trunk/ext/sockets/sockets.c 2011-03-30 09:42:21 UTC (rev
309840)
+++ php/php-src/trunk/ext/sockets/sockets.c 2011-03-30 09:46:20 UTC (rev
309841)
@@ -2479,7 +2479,7 @@
* private data; otherwise assume it's in non-blocking mode */
if (php_stream_is(stream, PHP_STREAM_IS_SOCKET)) {
retsock-blocking =
-
((php_netstream_data_t)stream-abstract)-is_blocked;
+ ((php_netstream_data_t
*)stream-abstract)-is_blocked;
} else {
retsock-blocking = 1;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/sockets/ sockets.c
pajoye Wed, 30 Mar 2011 09:46:56 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=309842
Log:
- not used on win
Changed paths:
U php/php-src/trunk/ext/sockets/sockets.c
Modified: php/php-src/trunk/ext/sockets/sockets.c
===
--- php/php-src/trunk/ext/sockets/sockets.c 2011-03-30 09:46:20 UTC (rev
309841)
+++ php/php-src/trunk/ext/sockets/sockets.c 2011-03-30 09:46:56 UTC (rev
309842)
@@ -2441,8 +2441,10 @@
PHP_SOCKET socket; /* fd */
php_sockaddr_storage addr;
socklen_taddr_len = sizeof(addr);
+#ifndef PHP_WIN32
int t;
-
+#endif
+
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r, zstream) ==
FAILURE) {
return;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
