diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | ext/standard/info.c | 8 | ||||
| -rw-r--r-- | sapi/cli/php_cli.c | 8 | ||||
| -rw-r--r-- | win32/build/confutils.js | 10 |
4 files changed, 15 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 9d9c8b155b..143dc06134 100644 --- 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 153cb6cde0..8ceef31d9f 100644 --- 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 5092fb0ffd..9d296acec6 100644 --- 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 31314ffd95..19fbd52aa9 100644 --- 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'); } |