diff options
| author | Anatol Belski <ab@php.net> | 2019-08-27 14:35:06 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2019-08-27 14:35:06 +0200 |
| commit | ad3c763e2c5291b97a6b0bd19e4c5314e5edf108 (patch) | |
| tree | 270515c7ca96eb5c95f143c265e3c25cbce0c67f | |
| parent | a748f7347d6e390f167243c03fbd7980711be130 (diff) | |
| parent | 9b5d66bd52c90f37aa39ea6bcab4c46b6121f3d8 (diff) | |
| download | php-git-ad3c763e2c5291b97a6b0bd19e4c5314e5edf108.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix signature and calls
| -rw-r--r-- | ext/standard/dl.c | 2 | ||||
| -rw-r--r-- | main/php_ini.c | 4 | ||||
| -rw-r--r-- | win32/winutil.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ext/standard/dl.c b/ext/standard/dl.c index ddc87a40d0..bef2e51e6f 100644 --- 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 d508c13b50..cc2cf16cf8 100644 --- 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 4b1d0448d5..f2faa95fa8 100644 --- 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 |