andrey Fri, 25 Feb 2011 13:11:49 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=308673
Log:
use ifdef all-around in the revert
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h 2011-02-25 12:52:46 UTC
(rev 308672)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h 2011-02-25 13:11:49 UTC
(rev 308673)
@@ -198,7 +198,7 @@
PHPAPI void mysqlnd_set_local_infile_handler(MYSQLND * const conn, const char
* const funcname);
/* Simple commands */
-#if AUTOCOMMIT_TX_COMMIT_ROLLBACK
+#ifdef AUTOCOMMIT_TX_COMMIT_ROLLBACK
#define mysqlnd_autocommit(conn, mode)
(conn)->m->set_autocommit((conn), (mode) TSRMLS_CC)
#define mysqlnd_commit(conn)
(conn)->m->tx_commit((conn) TSRMLS_CC)
#define mysqlnd_rollback(conn)
(conn)->m->tx_rollback((conn) TSRMLS_CC)
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h 2011-02-25
12:52:46 UTC (rev 308672)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h 2011-02-25
13:11:49 UTC (rev 308673)
@@ -482,7 +482,7 @@
func_mysqlnd_conn__ssl_set ssl_set;
func_mysqlnd_conn__result_init result_init;
-#if AUTOCOMMIT_TX_COMMIT_ROLLBACK
+#ifdef AUTOCOMMIT_TX_COMMIT_ROLLBACK
func_mysqlnd_conn__set_autocommit set_autocommit;
func_mysqlnd_conn__tx_commit tx_commit;
func_mysqlnd_conn__tx_rollback tx_rollback;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
