Merge branch 'PHP-7.4'

* PHP-7.4: Fix signature and calls
php · Aug 27, 2019 · ad3c763 · ad3c763
2 parents a748f73 + 9b5d66b
commit ad3c763
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/ext/standard/dl.c b/ext/standard/dl.c
@@ -168,7 +168,7 @@ PHPAPI int php_load_extension(char *filename, int type, int start_now)
 	}
 
 #ifdef PHP_WIN32
-	if (!php_win32_image_compatible(libpath, NULL, &err1)) {
+	if (!php_win32_image_compatible(libpath, &err1)) {
 			php_error_docref(NULL, error_type, err1);
 			efree(err1);
 			efree(libpath);

diff --git a/main/php_ini.c b/main/php_ini.c
@@ -341,7 +341,7 @@ static void php_load_zend_extension_cb(void *arg)
 	if (IS_ABSOLUTE_PATH(filename, length)) {
 #ifdef PHP_WIN32
 	char *err;
-	if (!php_win32_image_compatible(filename, NULL, &err)) {
+	if (!php_win32_image_compatible(filename, &err)) {
 		php_error(E_CORE_WARNING, err);
 		return;
 	}
@@ -392,7 +392,7 @@ static void php_load_zend_extension_cb(void *arg)
 		}
 
 #ifdef PHP_WIN32
-		if (!php_win32_image_compatible(libpath, NULL, &err1)) {
+		if (!php_win32_image_compatible(libpath, &err1)) {
 				php_error(E_CORE_WARNING, err1);
 				efree(err1);
 				efree(libpath);

diff --git a/win32/winutil.h b/win32/winutil.h
@@ -55,7 +55,7 @@ PHP_WINUTIL_API int php_win32_code_to_errno(unsigned long w32Err);
 
 PHP_WINUTIL_API char *php_win32_get_username(void);
 
-PHP_WINUTIL_API BOOL php_win32_image_compatible(const char *img, const char *path, char **err);
+PHP_WINUTIL_API BOOL php_win32_image_compatible(const char *img, char **err);
 PHP_WINUTIL_API BOOL php_win32_crt_compatible(const char *img, char **err);
 
 #endif