diff options
| author | Georg Richter <georg@php.net> | 2005-05-13 13:11:41 +0000 |
|---|---|---|
| committer | Georg Richter <georg@php.net> | 2005-05-13 13:11:41 +0000 |
| commit | 49e1484da8ce266016e3942c9cc390bbc7d0d965 (patch) | |
| tree | 8ca5f85cfa0021e13902186b1be210e47fb9b2e0 /ext/mysqli/php_mysqli.h | |
| parent | 45d2c2f1fd2691987f48a1bc318873f752cd5ce8 (diff) | |
| download | php-git-49e1484da8ce266016e3942c9cc390bbc7d0d965.tar.gz | |
- fixed compile error under windows. Functionality for changing the
character set was moved to libmysql (4.1 bk tree - will be merged into
5.0 within the next days).
- renamed mysql_set_character_set to mysqli_set_charset
Diffstat (limited to 'ext/mysqli/php_mysqli.h')
| -rw-r--r-- | ext/mysqli/php_mysqli.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h index d72b0a8dc0..ef420351a9 100644 --- a/ext/mysqli/php_mysqli.h +++ b/ext/mysqli/php_mysqli.h @@ -25,9 +25,6 @@ #undef LIST #endif -#include <my_global.h> -#include <my_sys.h> -#include <m_ctype.h> #include <mysql.h> #include <errmsg.h> @@ -104,7 +101,7 @@ typedef struct { #define PHP_MYSQLI_API __declspec(dllexport) #if MYSQL_VERSION_ID > 50005 #define HAVE_MYSQLI_SET_CHARSET -#elif MYSQL_VERSION_ID > 40110 && MYSQL_VERSION_ID < 50000 +#elif MYSQL_VERSION_ID > 40112 && MYSQL_VERSION_ID < 50000 #define HAVE_MYSQLI_SET_CHARSET #endif #else @@ -303,7 +300,7 @@ PHP_FUNCTION(mysqli_autocommit); PHP_FUNCTION(mysqli_change_user); PHP_FUNCTION(mysqli_character_set_name); #ifdef HAVE_MYSQLI_SET_CHARSET -PHP_FUNCTION(mysqli_set_character_set_name); +PHP_FUNCTION(mysqli_set_charset); #endif PHP_FUNCTION(mysqli_close); PHP_FUNCTION(mysqli_commit); |