cvs: php4 /ext/standard info.c

hholzgra Thu Aug 8 09:59:20 2002 EDT Modified files: /php4/ext/standard info.c Log: the order to do things is save-compile-commit no variations and make sure editor and shell are in the same dir :( Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.189 php4/ext/standard/info.c:1.190 --- php4/ext/standard/info.c:1.189 Thu Aug 8 09:31:49 2002 +++ php4/ext/standard/info.c Thu Aug 8 09:59:19 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.c,v 1.189 2002/08/08 13:31:49 hholzgra Exp $ */ +/* $Id: info.c,v 1.190 2002/08/08 13:59:19 hholzgra Exp $ */ #include "php.h" #include "php_ini.h" @@ -38,9 +38,6 @@ #include <sys/utsname.h> #endif -<<<<<<< info.c -#define SECTION(name) PUTS("<h2 align='center'>" name "</h2>\n") -======= #ifdef PHP_ATOM_INC #include "php_have_iconv.h" #endif @@ -49,8 +46,7 @@ ZEND_EXTERN_MODULE_GLOBALS(iconv) #endif -#define SECTION(name) PUTS("<h2 align=\"center\">" name "</h2>\n") ->>>>>>> 1.188 +#define SECTION(name) PUTS("<h2 align='center'>" name "</h2>\n") PHPAPI extern char *php_ini_opened_path;