Browse Source

add forgotten ifdefs, fix #33667 (mysqli doesn't compile)

PHP-5.1
Antony Dovgal 21 years ago
parent
commit
502b00c3f6
  1. 4
      ext/mysqli/mysqli_fe.c
  2. 2
      ext/mysqli/php_mysqli.h

4
ext/mysqli/mysqli_fe.c

@ -85,7 +85,9 @@ function_entry mysqli_functions[] = {
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 @@ function_entry mysqli_link_methods[] = {
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)

2
ext/mysqli/php_mysqli.h

@ -334,7 +334,9 @@ PHP_FUNCTION(mysqli_field_count);
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);

Loading…
Cancel
Save