Is this a critical patch to include in Beta 3?
Andi
At 08:38 PM 7/12/2005 +0000, Antony Dovgal wrote:
tony2001 Tue Jul 12 16:38:35 2005 EDT
Modified files:
/php-src/ext/mysqli mysqli_fe.c php_mysqli.h
Log:
add forgotten ifdefs, fix #33667 (mysqli doesn't compile)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.47&r2=1.48&ty=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.47
php-src/ext/mysqli/mysqli_fe.c:1.48
--- php-src/ext/mysqli/mysqli_fe.c:1.47 Fri Jun 24 10:44:45 2005
+++ php-src/ext/mysqli/mysqli_fe.c Tue Jul 12 16:38:34 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_fe.c,v 1.47 2005/06/24 14:44:45 georg Exp $
+ $Id: mysqli_fe.c,v 1.48 2005/07/12 20:38:34 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -85,7 +85,9 @@
PHP_FE(mysqli_field_seek,
NULL)
PHP_FE(mysqli_field_tell,
NULL)
PHP_FE(mysqli_free_result,
NULL)
+#ifdef HAVE_MYSQLI_GET_CHARSET
PHP_FE(mysqli_get_charset,
NULL)
+#endif
PHP_FE(mysqli_get_client_info,
NULL)
PHP_FE(mysqli_get_client_version,
NULL)
PHP_FE(mysqli_get_host_info,
NULL)
@@ -194,7 +196,9 @@
PHP_FALIAS(dump_debug_info,mysqli_dump_debug_info,NULL)
PHP_FALIAS(enable_reads_from_master,mysqli_enable_reads_from_master,NULL)
PHP_FALIAS(enable_rpl_parse,mysqli_enable_rpl_parse,NULL)
+#ifdef HAVE_MYSQLI_GET_CHARSET
PHP_FALIAS(get_charset,mysqli_get_charset,NULL)
+#endif
PHP_FALIAS(get_client_info,mysqli_get_client_info,NULL)
PHP_FALIAS(get_server_info,mysqli_get_server_info,NULL)
PHP_FALIAS(get_warnings, mysqli_get_warnings, NULL)
http://cvs.php.net/diff.php/php-src/ext/mysqli/php_mysqli.h?r1=1.52&r2=1.53&ty=u
Index: php-src/ext/mysqli/php_mysqli.h
diff -u php-src/ext/mysqli/php_mysqli.h:1.52
php-src/ext/mysqli/php_mysqli.h:1.53
--- php-src/ext/mysqli/php_mysqli.h:1.52 Tue Jul 12 11:45:07 2005
+++ php-src/ext/mysqli/php_mysqli.h Tue Jul 12 16:38:34 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: php_mysqli.h,v 1.52 2005/07/12 15:45:07 georg Exp $
+ $Id: php_mysqli.h,v 1.53 2005/07/12 20:38:34 tony2001 Exp $
*/
/* A little hack to prevent build break, when mysql is used together with
@@ -334,7 +334,9 @@
PHP_FUNCTION(mysqli_field_seek);
PHP_FUNCTION(mysqli_field_tell);
PHP_FUNCTION(mysqli_free_result);
+#ifdef HAVE_MYSQLI_GET_CHARSET
PHP_FUNCTION(mysqli_get_charset);
+#endif
PHP_FUNCTION(mysqli_get_client_info);
PHP_FUNCTION(mysqli_get_client_version);
PHP_FUNCTION(mysqli_get_host_info);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
