Fix signature and calls

diff --git a/ext/standard/dl.c b/ext/standard/dl.c
index ddc87a40d0061c5083894836fd51dfe97a90ff13..bef2e51e6f378b2a38e3ba1385803aad8daa2a41 100644 (file)
--- 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
index d508c13b50ae6f77a9188cb0a3c523f2f02e28ab..cc2cf16cf8b9b880b80af57d9bab89d4fd551eb5 100644 (file)
--- 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
index 4b1d0448d51d761e82f765f8f8c2e7685961875c..f2faa95fa825fa85b0e08008e126060e480531ee 100644 (file)
--- 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