cvs: php-src /ext/standard info.c

sfox Mon Jul 21 09:58:28 2008 UTC Modified files: /php-src/ext/standard info.c Log: MFB Make compiler/architecture info potentially cross-platform http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.289&r2=1.290&diff_format=u Index: php-src/ext/standard/info.c diff -u php-src/ext/standard/info.c:1.289 php-src/ext/standard/info.c:1.290 --- php-src/ext/standard/info.c:1.289 Tue May 27 18:27:23 2008 +++ php-src/ext/standard/info.c Mon Jul 21 09:58:28 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.c,v 1.289 2008/05/27 18:27:23 pajoye Exp $ */ +/* $Id: info.c,v 1.290 2008/07/21 09:58:28 sfox Exp $ */ #include "php.h" #include "php_ini.h" @@ -50,19 +50,6 @@ #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 @@ 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