replace the stack var by a macro

diff --git a/ext/standard/dl.c b/ext/standard/dl.c
index 050516639e11e73e44f72d5dfef1c4957016b412..5adae805ce6f9ded234174616e5d65ca4bcbd379 100644 (file)
--- a/ext/standard/dl.c
+++ b/ext/standard/dl.c
@@ -116,17 +116,15 @@ PHPAPI int php_load_extension(char *filename, int type, int start_now)
                } else {
                        spprintf(&libpath, 0, "%s%c%s", extension_dir, DEFAULT_SLASH, filename); /* SAFE */
                }
+
                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)) {

diff --git a/main/build-defs.h.in b/main/build-defs.h.in
index c82982a32a13206dfa8eb7495eb0b96d8e4d8023..fb9bc7f8818d84b37a5e9179733a93427ca4e97f 100644 (file)
--- a/main/build-defs.h.in
+++ b/main/build-defs.h.in
@@ -89,3 +89,4 @@
 #define PHP_CONFIG_FILE_PATH    "@EXPANDED_PHP_CONFIG_FILE_PATH@"
 #define PHP_CONFIG_FILE_SCAN_DIR    "@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@"
 #define PHP_SHLIB_SUFFIX        "@SHLIB_DL_SUFFIX_NAME@"
+#define PHP_SHLIB_EXT_PREFIX    ""

diff --git a/main/php_ini.c b/main/php_ini.c
index 8b53f304413c0569033caebb2838ebb688d89843..98896a5f866d104f2e67e60a73689cf1cf4a6be1 100644 (file)
--- 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)) {

diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in
index 573eb95a94eda39c6767255de84270eaf7fc0dd0..9572f65d82170f62b00ecf7e8055a663c193a937 100644 (file)
--- a/win32/build/config.w32.h.in
+++ b/win32/build/config.w32.h.in
@@ -136,6 +136,7 @@
 #define HAVE_FNMATCH
 #define HAVE_GLOB
 #define PHP_SHLIB_SUFFIX "dll"
+#define PHP_SHLIB_EXT_PREFIX "php_"
 #define HAVE_SQLDATASOURCES
 
 /* Win32 supports strcoll */