From: Steph Fox <sfox@php.net>
Date: Mon, 7 Jul 2008 01:25:53 +0000 (+0000)
Subject: - Don't do stuff twice over
X-Git-Tag: php-5.3.0alpha1~465
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=005c6c8f0443b97dd9d5b63cd53abb4742279221;p=php

- Don't do stuff twice over
@Jani: pick up mail!
---

diff --git a/ext/standard/info.c b/ext/standard/info.c
index 88225665ae..5f7d089509 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -48,18 +48,6 @@ ZEND_EXTERN_MODULE_GLOBALS(mbstring)
 ZEND_EXTERN_MODULE_GLOBALS(iconv)
 #endif
 
-#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) { \
 							PUTS("<h2>" name "</h2>\n"); \
 						} else { \
@@ -473,15 +461,16 @@ 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
 
-
-#ifdef PHP_WIN32
-		php_info_print_table_row(2, "Windows Compiler and Version", PHP_WINAPI_COMPILER );
-#endif
-
 		if (sapi_module.pretty_name) {
 			php_info_print_table_row(2, "Server API", sapi_module.pretty_name );
 		}