Re: cvs: php-src(PHP_5_3) /ext/standard info.c
| From: | Jani Taskinen | Date: | Mon, 07 Jul 2008 10:48:57 +0000 |
| Subject: | Re: cvs: php-src(PHP_5_3) /ext/standard info.c | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-50877@lists.php.net to get a copy of this message | ||
Good luck figuring out the info with different compilers..and which architecture you want there? Host, build or target?
IMO, this needs too much work to get working properly so count me out.
--Jani
Steph Fox wrote:
sfox Mon Jul 7 01:25:53 2008 UTCModified files: (Branch: PHP_5_3) /php-src/ext/standard info.c Log:- Don't do stuff twice over @Jani: pick up mail! http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.8&r2=1.249.2.10.2.14.2.9&diff_format=u Index: php-src/ext/standard/info.c diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.8 php-src/ext/standard/info.c:1.249.2.10.2.14.2.9 --- php-src/ext/standard/info.c:1.249.2.10.2.14.2.8 Thu Jul 3 08:06:55 2008 +++ php-src/ext/standard/info.c Mon Jul 7 01:25:53 2008 @@ -18,7 +18,7 @@+----------------------------------------------------------------------+*/ -/* $Id: info.c,v 1.249.2.10.2.14.2.8 2008/07/03 08:06:55 tony2001 Exp $ */ +/* $Id: info.c,v 1.249.2.10.2.14.2.9 2008/07/07 01:25:53 sfox Exp $ */ #include "php.h" #include "php_ini.h" @@ -48,18 +48,6 @@ 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 @@ 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 ); }