eliminate duplicated identical function definitions

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 6c6626773e808991b2a2e6eea9cb3531ba9b5883..65c273a5bc0514964cf9d1f3a197d36a215f1388 100644 (file)
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -114,46 +114,6 @@ var php_usual_lib_suspects = PHP_PHP_BUILD+"\\lib";
 ADD_FLAG("CFLAGS", '/I "' + php_usual_include_suspects + '" ');
 ADD_FLAG("LDFLAGS", '/libpath:"' + php_usual_lib_suspects + '" ');
 
-// Poke around for some headers
-function probe_basic_headers()
-{
-       var p;
-
-       if (PHP_PHP_BUILD != "no") {
-               php_usual_include_suspects += ";" + PHP_PHP_BUILD + "\\include";
-               php_usual_lib_suspects += ";" + PHP_PHP_BUILD + "\\lib";
-       }
-}
-
-function add_extra_dirs()
-{
-       var path, i, f;
-
-       if (PHP_EXTRA_INCLUDES.length) {
-               path = PHP_EXTRA_INCLUDES.split(';');
-               for (i = 0; i < path.length; i++) {
-                       f = FSO.GetAbsolutePathName(path[i]);
-                       if (FSO.FolderExists(f)) {
-                               ADD_FLAG("CFLAGS", '/I "' + f + '" ');
-                       }
-               }
-       }
-       if (PHP_EXTRA_LIBS.length) {
-               path = PHP_EXTRA_LIBS.split(';');
-               for (i = 0; i < path.length; i++) {
-                       f = FSO.GetAbsolutePathName(path[i]);
-                       if (FSO.FolderExists(f)) {
-                               if (VS_TOOLSET && VCVERS <= 1200 && f.indexOf(" ") >= 0) {
-                                       ADD_FLAG("LDFLAGS", '/libpath:"\\"' + f + '\\"" ');
-                               } else {
-                                       ADD_FLAG("LDFLAGS", '/libpath:"' + f + '" ');
-                               }
-                       }
-               }
-       }
-
-}
-
 probe_basic_headers();
 add_extra_dirs();
 

diff --git a/win32/build/config.w32.phpize.in b/win32/build/config.w32.phpize.in
index 91b3552412d9048d1f92fecf9df2d53dda864305..8b831f0b10ddee5a90d3b4b8d2099c75669ae548 100644 (file)
--- a/win32/build/config.w32.phpize.in
+++ b/win32/build/config.w32.phpize.in
@@ -98,46 +98,6 @@ var php_usual_lib_suspects = PHP_PHP_BUILD+"\\lib";
 ADD_FLAG("CFLAGS", '/I "' + php_usual_include_suspects + '" ');\r
 ADD_FLAG("LDFLAGS", '/libpath:"\\"' + php_usual_lib_suspects + '\\"" ');\r
 \r
-// Poke around for some headers\r
-function probe_basic_headers()\r
-{\r
-       var p;\r
-\r
-       if (PHP_PHP_BUILD != "no") {\r
-               php_usual_include_suspects += ";" + PHP_PHP_BUILD + "\\include";\r
-               php_usual_lib_suspects += ";" + PHP_PHP_BUILD + "\\lib";\r
-       }\r
-}\r
-\r
-function add_extra_dirs()\r
-{\r
-       var path, i, f;\r
-\r
-       if (PHP_EXTRA_INCLUDES.length) {\r
-               path = PHP_EXTRA_INCLUDES.split(';');\r
-               for (i = 0; i < path.length; i++) {\r
-                       f = FSO.GetAbsolutePathName(path[i]);\r
-                       if (FSO.FolderExists(f)) {\r
-                               ADD_FLAG("CFLAGS", '/I "' + f + '" ');\r
-                       }\r
-               }\r
-       }\r
-       if (PHP_EXTRA_LIBS.length) {\r
-               path = PHP_EXTRA_LIBS.split(';');\r
-               for (i = 0; i < path.length; i++) {\r
-                       f = FSO.GetAbsolutePathName(path[i]);\r
-                       if (FSO.FolderExists(f)) {\r
-                               if (VCVERS <= 1200 && f.indexOf(" ") >= 0) {\r
-                                       ADD_FLAG("LDFLAGS", '/libpath:"\\"' + f + '\\"" ');\r
-                               } else {\r
-                                       ADD_FLAG("LDFLAGS", '/libpath:"' + f + '" ');\r
-                               }\r
-                       }\r
-               }\r
-       }\r
-\r
-}\r
-\r
 probe_basic_headers();\r
 add_extra_dirs();\r
 \r
@@ -147,7 +107,6 @@ STDOUT.WriteBlankLines(1);
 STDOUT.WriteLine("Build dir: " + get_define('BUILD_DIR'));\r
 STDOUT.WriteLine("PHP Core:  " + get_define('PHPDLL') + " and " + get_define('PHPLIB'));\r
 \r
-\r
 /* XXX inspect this for other toolsets */\r
 if (VS_TOOLSET && VCVERS == 1200) {\r
        AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1);\r

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 1c47ace175f63cd0542805f68a6c97c0617471d6..1aac59ea5f8f4c3fca4a8c620dfe13c3fab37945 100644 (file)
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -2708,3 +2708,43 @@ function php_build_option_handle()
        DEFINE("PHP_BUILD", PHP_PHP_BUILD);
 }
 
+// Poke around for some headers
+function probe_basic_headers()
+{
+       var p;
+
+       if (PHP_PHP_BUILD != "no") {
+               php_usual_include_suspects += ";" + PHP_PHP_BUILD + "\\include";
+               php_usual_lib_suspects += ";" + PHP_PHP_BUILD + "\\lib";
+       }
+}
+
+function add_extra_dirs()
+{
+       var path, i, f;
+
+       if (PHP_EXTRA_INCLUDES.length) {
+               path = PHP_EXTRA_INCLUDES.split(';');
+               for (i = 0; i < path.length; i++) {
+                       f = FSO.GetAbsolutePathName(path[i]);
+                       if (FSO.FolderExists(f)) {
+                               ADD_FLAG("CFLAGS", '/I "' + f + '" ');
+                       }
+               }
+       }
+       if (PHP_EXTRA_LIBS.length) {
+               path = PHP_EXTRA_LIBS.split(';');
+               for (i = 0; i < path.length; i++) {
+                       f = FSO.GetAbsolutePathName(path[i]);
+                       if (FSO.FolderExists(f)) {
+                               if (VS_TOOLSET && VCVERS <= 1200 && f.indexOf(" ") >= 0) {
+                                       ADD_FLAG("LDFLAGS", '/libpath:"\\"' + f + '\\"" ');
+                               } else {
+                                       ADD_FLAG("LDFLAGS", '/libpath:"' + f + '" ');
+                               }
+                       }
+               }
+       }
+
+}
+