From: Andrey Hristov <andrey@php.net>
Date: Mon, 10 Mar 2008 09:16:13 +0000 (+0000)
Subject: - Fix a warning in php_mysql.c
X-Git-Tag: RELEASE_2_0_0a1~191
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8e4046c72d300bde42070dee92a8ca005650ae3;p=php

- Fix a warning in php_mysql.c
- Fixed #44371 Extension compile failed
---

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"