diff options
| author | Antony Dovgal <tony2001@php.net> | 2005-07-12 20:38:34 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2005-07-12 20:38:34 +0000 |
| commit | 502b00c3f686253d91c061fca511f8fbfe1698fb (patch) | |
| tree | 7bf387dc8f6ad8819af97ac4d54eedb98f1704ac | |
| parent | 2fdbd380ba0ce55b18fa07294c9988db39767a25 (diff) | |
| download | php-git-502b00c3f686253d91c061fca511f8fbfe1698fb.tar.gz | |
add forgotten ifdefs, fix #33667 (mysqli doesn't compile)
| -rw-r--r-- | ext/mysqli/mysqli_fe.c | 4 | ||||
| -rw-r--r-- | ext/mysqli/php_mysqli.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c index 3f9f2650fd..fbdf2adff3 100644 --- a/ext/mysqli/mysqli_fe.c +++ b/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) diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h index d07ccfb162..b4049c9401 100644 --- a/ext/mysqli/php_mysqli.h +++ b/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); |