diff options
| author | Georg Richter <georg@php.net> | 2005-05-13 13:53:08 +0000 |
|---|---|---|
| committer | Georg Richter <georg@php.net> | 2005-05-13 13:53:08 +0000 |
| commit | 146a948d37ad36196ea64b0f73303c0879843048 (patch) | |
| tree | 903807258542be4e97ac1102f21b1d76053214aa /ext/mysqli/php_mysqli.h | |
| parent | a778e8ae49054a08c5de1a7e3010adb7fae04b53 (diff) | |
| download | php-git-146a948d37ad36196ea64b0f73303c0879843048.tar.gz | |
MFH:
fixed windows compilation bug
renamed mysqli_set_character_set_name to mysqli_set_charset
Diffstat (limited to 'ext/mysqli/php_mysqli.h')
| -rw-r--r-- | ext/mysqli/php_mysqli.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h index 45abd0d6da..4bbfd36561 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> @@ -94,16 +91,14 @@ typedef struct { #ifdef PHP_WIN32 #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 -#define HAVE_MYSQLI_SET_CHARSET -#endif #else -#define HAVE_MYSQLI_SET_CHARSET #define PHP_MYSQLI_API #endif +#if MYSQL_VERSION_ID > 40112 && MYSQL_VERSION_ID < 50000 +#define HAVE_MYSQLI_SET_CHARSET +#endif + #ifdef ZTS #include "TSRM.h" #endif @@ -283,7 +278,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); |