From 9ad0d0ca3c25306f78b5bf08949b10ca516f614c Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 6 Jul 2017 20:47:04 +0200 Subject: replace the stack var by a macro --- main/php_ini.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'main/php_ini.c') diff --git a/main/php_ini.c b/main/php_ini.c index 8b53f30441..98896a5f86 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -375,16 +375,12 @@ static void php_load_zend_extension_cb(void *arg) if (VCWD_ACCESS(libpath, F_OK)) { /* If file does not exist, consider as extension name and build file name */ - const char *libpath_prefix = ""; char *orig_libpath = libpath; -#if PHP_WIN32 - libpath_prefix = "php_"; -#endif if (slash_suffix) { - spprintf(&libpath, 0, "%s%s%s." PHP_SHLIB_SUFFIX, extension_dir, libpath_prefix, filename); /* SAFE */ + spprintf(&libpath, 0, "%s" PHP_SHLIB_EXT_PREFIX "%s." PHP_SHLIB_SUFFIX, extension_dir, filename); /* SAFE */ } else { - spprintf(&libpath, 0, "%s%c%s%s." PHP_SHLIB_SUFFIX, extension_dir, DEFAULT_SLASH, libpath_prefix, filename); /* SAFE */ + spprintf(&libpath, 0, "%s%c" PHP_SHLIB_EXT_PREFIX "%s." PHP_SHLIB_SUFFIX, extension_dir, DEFAULT_SLASH, filename); /* SAFE */ } if (VCWD_ACCESS(libpath, F_OK)) { -- cgit v1.2.1