diff options
| author | Andrey Hristov <andrey@php.net> | 2008-03-10 09:16:13 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2008-03-10 09:16:13 +0000 |
| commit | a8e4046c72d300bde42070dee92a8ca005650ae3 (patch) | |
| tree | 533fb04bfe7bbe47d494cddf5dbd1fc6e7c25257 /ext | |
| parent | c1e0fb5ad3ff176654aec69205432c63c5e11f5d (diff) | |
| download | php-git-a8e4046c72d300bde42070dee92a8ca005650ae3.tar.gz | |
- Fix a warning in php_mysql.c
- Fixed #44371 Extension compile failed
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/mysql/php_mysql.c | 2 | ||||
| -rw-r--r-- | ext/mysqli/php_mysqli_structs.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 5a41061f59..03561760a1 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -663,7 +663,7 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) client_flags ^= CLIENT_LOCAL_FILES; } - hashed_details_length = spprintf(&hashed_details, 0, "mysql_%s_%s_%s_%d", SAFE_STRING(host_and_port), SAFE_STRING(user), SAFE_STRING(passwd), client_flags); + hashed_details_length = spprintf(&hashed_details, 0, "mysql_%s_%s_%s_%ld", SAFE_STRING(host_and_port), SAFE_STRING(user), SAFE_STRING(passwd), client_flags); } /* We cannot use mysql_port anymore in windows, need to use diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h index b61a346848..e11b008484 100644 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@ -38,11 +38,11 @@ #ifdef HAVE_MYSQLND #include "ext/mysqlnd/mysqlnd.h" -#include "ext/mysqli/mysqli_mysqlnd.h" +#include "mysqli_mysqlnd.h" #else #include <mysql.h> #include <errmsg.h> -#include "ext/mysqli/mysqli_libmysql.h" +#include "mysqli_libmysql.h" #endif #include "php_mysqli.h" |