andrey Thu, 03 Dec 2009 10:50:02 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=291638
Log:
I svn-commit.2.tmp (Modified)
Row 2 Col 28 11:45 Ctrl-K H for
help
fix compilation on windows and with other compilers who
don't like void* arithmetic
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2009-12-03 10:41:20 UTC
(rev 291637)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2009-12-03 10:50:02 UTC
(rev 291638)
@@ -2393,9 +2393,7 @@
if (!conn || plugin_id >= mysqlnd_plugin_count()) {
return NULL;
}
-#if 0
- DBG_RETURN((void *)conn + sizeof(MYSQLND) + plugin_id * sizeof(void *));
-#endif
+ DBG_RETURN((void *)((char *)conn + sizeof(MYSQLND) + plugin_id *
sizeof(void *)));
}
/* }}} */
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2009-12-03 10:41:20 UTC (rev
291637)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2009-12-03 10:50:02 UTC (rev
291638)
@@ -2393,9 +2393,7 @@
if (!conn || plugin_id >= mysqlnd_plugin_count()) {
return NULL;
}
-#if 0
- DBG_RETURN((void *)conn + sizeof(MYSQLND) + plugin_id * sizeof(void *));
-#endif
+ DBG_RETURN((void *)((char *)conn + sizeof(MYSQLND) + plugin_id *
sizeof(void *)));
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
