rename COMPILER and ARCHITECTURE macro (too generic)

diff --git a/configure.ac b/configure.ac
index 9d9c8b155b07e495ef3fea6f1adaf25f8b580021..143dc061346b36b38d0770e4eaf2edae2746ef77 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1283,10 +1283,10 @@ if test -n "${PHP_BUILD_PROVIDER}"; then
   AC_DEFINE_UNQUOTED(PHP_BUILD_PROVIDER,"$PHP_BUILD_PROVIDER",[build provider])
 fi
 if test -n "${PHP_BUILD_COMPILER}"; then
-  AC_DEFINE_UNQUOTED(COMPILER,"$PHP_BUILD_COMPILER",[used compiler for build])
+  AC_DEFINE_UNQUOTED(PHP_BUILD_COMPILER,"$PHP_BUILD_COMPILER",[used compiler for build])
 fi
 if test -n "${PHP_BUILD_ARCH}"; then
-  AC_DEFINE_UNQUOTED(ARCHITECTURE,"$PHP_BUILD_ARCH",[build architecture])
+  AC_DEFINE_UNQUOTED(PHP_BUILD_ARCH,"$PHP_BUILD_ARCH",[build architecture])
 fi
 
 PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)

diff --git a/ext/standard/info.c b/ext/standard/info.c
index 153cb6cde0140d496abef8502a2622c6cca88f20..8ceef31d9fe4fb511af7e33bfbdb7c01cc4e6079 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -798,11 +798,11 @@ PHPAPI ZEND_COLD void php_print_info(int flag)
 #ifdef PHP_BUILD_PROVIDER
                php_info_print_table_row(2, "Build Provider", PHP_BUILD_PROVIDER);
 #endif
-#ifdef COMPILER
-               php_info_print_table_row(2, "Compiler", COMPILER);
+#ifdef PHP_BUILD_COMPILER
+               php_info_print_table_row(2, "Compiler", PHP_BUILD_COMPILER);
 #endif
-#ifdef ARCHITECTURE
-               php_info_print_table_row(2, "Architecture", ARCHITECTURE);
+#ifdef PHP_BUILD_ARCH
+               php_info_print_table_row(2, "Architecture", PHP_BUILD_ARCH);
 #endif
 #ifdef CONFIGURE_COMMAND
                php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND );

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 5092fb0ffd68143f9d54dc20be3ba7d59b8e40d1..9d296acec631b72f394a797804bf384fbf756b79 100644 (file)
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -645,12 +645,12 @@ static int do_cli(int argc, char **argv) /* {{{ */
 #else
                                        "NTS "
 #endif
-#ifdef COMPILER
-                                       COMPILER
+#ifdef PHP_BUILD_COMPILER
+                                       PHP_BUILD_COMPILER
                                        " "
 #endif
-#ifdef ARCHITECTURE
-                                       ARCHITECTURE
+#ifdef PHP_BUILD_ARCH
+                                       PHP_BUILD_ARCH
                                        " "
 #endif
 #if ZEND_DEBUG

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 31314ffd95db2e00115ede4aebc333964ae4a631..19fbd52aa999cc60a19f710a2bf9912b71a3053c 100644 (file)
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -2944,25 +2944,25 @@ function toolset_setup_compiler()
 
                        WARNING("Using unknown MSVC version " + tmp);
 
-                       AC_DEFINE('COMPILER', COMPILER_NAME_LONG, "Detected compiler version");
+                       AC_DEFINE('PHP_BUILD_COMPILER', COMPILER_NAME_LONG, "Detected compiler version");
                        DEFINE("PHP_COMPILER_SHORT", tmp);
                        AC_DEFINE('PHP_COMPILER_ID', tmp, "Compiler compatibility ID");
                } else {
-                       AC_DEFINE('COMPILER', COMPILER_NAME_LONG, "Detected compiler version");
+                       AC_DEFINE('PHP_BUILD_COMPILER', COMPILER_NAME_LONG, "Detected compiler version");
                        DEFINE("PHP_COMPILER_SHORT", COMPILER_NAME_SHORT.toLowerCase());
                        AC_DEFINE('PHP_COMPILER_ID', COMPILER_NAME_SHORT.toUpperCase(), "Compiler compatibility ID");
                }
        } else if (CLANG_TOOLSET) {
                CLANGVERS = COMPILER_NUMERIC_VERSION;
 
-               AC_DEFINE('COMPILER', COMPILER_NAME_LONG, "Detected compiler version");
+               AC_DEFINE('PHP_BUILD_COMPILER', COMPILER_NAME_LONG, "Detected compiler version");
                DEFINE("PHP_COMPILER_SHORT", "clang");
                AC_DEFINE('PHP_COMPILER_ID', "clang"); /* XXX something better were to write here */
 
        } else if (ICC_TOOLSET) {
                INTELVERS = COMPILER_NUMERIC_VERSION;
 
-               AC_DEFINE('COMPILER', COMPILER_NAME_LONG, "Detected compiler version");
+               AC_DEFINE('PHP_BUILD_COMPILER', COMPILER_NAME_LONG, "Detected compiler version");
                DEFINE("PHP_COMPILER_SHORT", "icc");
                AC_DEFINE('PHP_COMPILER_ID', "icc"); /* XXX something better were to write here */
        }
@@ -3162,7 +3162,7 @@ function toolset_setup_arch()
        } else {
                STDOUT.WriteLine("  Detected 32-bit compiler");
        }
-       AC_DEFINE('ARCHITECTURE', X64 ? 'x64' : 'x86', "Detected compiler architecture");
+       AC_DEFINE('PHP_BUILD_ARCH', X64 ? 'x64' : 'x86', "Detected compiler architecture");
        DEFINE("PHP_ARCHITECTURE", X64 ? 'x64' : 'x86');
 }