pajoye Fri, 11 Dec 2009 16:35:42 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=291995
Log:
- fix build, come on, it is not that hard to test before commit, is it?
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
U php/php-src/branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_int.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
U php/php-src/trunk/ext/pdo_mysql/php_pdo_mysql_int.h
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
2009-12-11 16:07:57 UTC (rev 291994)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
2009-12-11 16:35:42 UTC (rev 291995)
@@ -2319,8 +2319,10 @@
void
mysqlnd_net_free(MYSQLND_NET * net TSRMLS_DC)
{
+ zend_bool pers = net->persistent;
+
DBG_ENTER("mysqlnd_net_free");
- zend_bool pers = net->persistent;
+
if (net) {
if (net->cmd_buffer.buffer) {
DBG_INF("Freeing cmd buffer");
Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_int.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_int.h
2009-12-11 16:07:57 UTC (rev 291994)
+++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_int.h
2009-12-11 16:35:42 UTC (rev 291995)
@@ -70,6 +70,12 @@
char *debug; /* The actual string */
MYSQLND_DEBUG *dbg; /* The DBG object */
#endif
+#if defined(PHP_WIN32) && !PDO_DBG_ENABLED
+ /* dummy member so we get at least one member in the struct
+ * and avoids build errors.
+ */
+ void *dummymemmber;
+#endif
ZEND_END_MODULE_GLOBALS(pdo_mysql)
ZEND_EXTERN_MODULE_GLOBALS(pdo_mysql);
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c 2009-12-11
16:07:57 UTC (rev 291994)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c 2009-12-11
16:35:42 UTC (rev 291995)
@@ -2319,8 +2319,10 @@
void
mysqlnd_net_free(MYSQLND_NET * net TSRMLS_DC)
{
+ zend_bool pers = net->persistent;
+
DBG_ENTER("mysqlnd_net_free");
- zend_bool pers = net->persistent;
+
if (net) {
if (net->cmd_buffer.buffer) {
DBG_INF("Freeing cmd buffer");
Modified: php/php-src/trunk/ext/pdo_mysql/php_pdo_mysql_int.h
===================================================================
--- php/php-src/trunk/ext/pdo_mysql/php_pdo_mysql_int.h 2009-12-11 16:07:57 UTC
(rev 291994)
+++ php/php-src/trunk/ext/pdo_mysql/php_pdo_mysql_int.h 2009-12-11 16:35:42 UTC
(rev 291995)
@@ -70,6 +70,12 @@
char *debug; /* The actual string */
MYSQLND_DEBUG *dbg; /* The DBG object */
#endif
+#if defined(PHP_WIN32) && !PDO_DBG_ENABLED
+ /* dummy member so we get at least one member in the struct
+ * and avoids build errors.
+ */
+ void *dummymemmber;
+#endif
ZEND_END_MODULE_GLOBALS(pdo_mysql)
ZEND_EXTERN_MODULE_GLOBALS(pdo_mysql);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
