cvs: php4 / php.h /ext/standard/ info.c

zeev Fri May 19 10:28:53 2000 EDT Modified files: /php4 php.h /php4/ext/standard info.c Log: Minor output mods Index: php4/php.h diff -u php4/php.h:1.92 php4/php.h:1.93 --- php4/php.h:1.92 Thu May 18 17:34:21 2000 +++ php4/php.h Fri May 19 10:28:53 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.92 2000/05/18 15:34:21 zeev Exp $ */ +/* $Id: php.h,v 1.93 2000/05/19 08:28:53 zeev Exp $ */ #ifndef _PHP_H #define _PHP_H @@ -255,8 +255,6 @@ #define php_error php_error_cb #endif - -extern void html_putc(char c); #define zenderror phperror #define zendlex phplex Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.92 php4/ext/standard/info.c:1.93 --- php4/ext/standard/info.c:1.92 Thu May 18 17:34:35 2000 +++ php4/ext/standard/info.c Fri May 19 10:28:53 2000 @@ -28,6 +28,7 @@ #include "build-defs.h" #endif #include "zend_globals.h" /* needs ELS */ +#include "zend_highlight.h" #define PHP_CONF_LONG(directive,value1,value2) \ @@ -139,6 +140,8 @@ ta = php_localtime_r(&the_time, &tmbuf); if (flag & PHP_INFO_GENERAL) { + char *zend_version = get_zend_version(); + #ifdef PHP_WIN32 // Get build numbers for Windows NT or Win95 if (dwVersion < 0x80000000){ @@ -208,7 +211,9 @@ } PUTS("?=PHPE9568F35-D428-11d2-A769-00AA001ACF42\" border=\"0\" align=\"right\"></a>\n"); } - php_printf("This program makes use of the Zend scripting language engine:<pre>%s</pre>\n", get_zend_version()); + php_printf("This program makes use of the Zend scripting language engine:<BR>"); + zend_html_puts(zend_version, strlen(zend_version)); + php_printf("</BR>\n"); php_info_print_box_end(); }