johannes Mon, 05 Sep 2011 13:05:15 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=316174
Log:
Fix #ifdef for mixed builds (ext/mysql using myslqnd, mysqli using libmysql)
Changed paths:
U php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c
U php/php-src/trunk/ext/mysqli/mysqli.c
Modified: php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c 2011-09-05 13:04:12 UTC
(rev 316173)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c 2011-09-05 13:05:15 UTC
(rev 316174)
@@ -838,7 +838,7 @@
#endif
-#ifdef MYSQL_USE_MYSQLND
+#ifdef MYSQLI_USE_MYSQLND
mysqlnd_register_api_extension(&mysqli_api_ext);
#endif
Modified: php/php-src/trunk/ext/mysqli/mysqli.c
===================================================================
--- php/php-src/trunk/ext/mysqli/mysqli.c 2011-09-05 13:04:12 UTC (rev
316173)
+++ php/php-src/trunk/ext/mysqli/mysqli.c 2011-09-05 13:05:15 UTC (rev
316174)
@@ -838,7 +838,7 @@
#endif
-#ifdef MYSQL_USE_MYSQLND
+#ifdef MYSQLI_USE_MYSQLND
mysqlnd_register_api_extension(&mysqli_api_ext);
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
