summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteph Fox <sfox@php.net>2008-07-21 09:58:28 +0000
committerSteph Fox <sfox@php.net>2008-07-21 09:58:28 +0000
commitd5970d85be2359a531930e7810ea945df8840d0d (patch)
tree5e58105d7d576512af6be5e8a27113846fd5ab5a
parent9a7b2f0b9fd69b3c9a0255004241c1bb85be9e10 (diff)
downloadphp-git-d5970d85be2359a531930e7810ea945df8840d0d.tar.gz
MFB Make compiler/architecture info potentially cross-platform
-rw-r--r--ext/standard/info.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/ext/standard/info.c b/ext/standard/info.c
index 13211b65f3..bff35a55c6 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -50,19 +50,6 @@ ZEND_EXTERN_MODULE_GLOBALS(iconv)
#include <unicode/uversion.h>
-
-#if _MSC_VER >= 1500
-# define PHP_WINAPI_COMPILER "MSVC9 (2008)"
-#elif _MSC_VER >= 1400
-# define PHP_WINAPI_COMPILER "MSVC8 (2005)"
-#elif _MSC_VER >= 1310
-# define PHP_WINAPI_COMPILER "MSVC7.1 (.NET 2003)"
-#elif _MSC_VER >= 1300
-# define PHP_WINAPI_COMPILER "MSVC7 (.NET 2002)"
-#elif _MSC_VER < 1300
-# define PHP_WINAPI_COMPILER "MSVC6 "
-#endif
-
#define SECTION(name) if (!sapi_module.phpinfo_as_text) { \
php_info_print("<h2>" name "</h2>\n"); \
} else { \
@@ -558,6 +545,12 @@ PHPAPI void php_print_info(int flag TSRMLS_DC)
php_info_print_table_start();
php_info_print_table_row(2, "System", php_uname );
php_info_print_table_row(2, "Build Date", __DATE__ " " __TIME__ );
+#ifdef COMPILER
+ php_info_print_table_row(2, "Compiler", COMPILER);
+#endif
+#ifdef ARCHITECTURE
+ php_info_print_table_row(2, "Architecture", ARCHITECTURE);
+#endif
#ifdef CONFIGURE_COMMAND
php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND );
#endif