cvs: php4 /main main.c

sniper Thu May 9 15:58:40 2002 EDT Modified files: /php4/main main.c Log: ws fix Index: php4/main/main.c diff -u php4/main/main.c:1.448 php4/main/main.c:1.449 --- php4/main/main.c:1.448 Wed May 8 08:33:41 2002 +++ php4/main/main.c Thu May 9 15:58:39 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.448 2002/05/08 12:33:41 hirokawa Exp $ */ +/* $Id: main.c,v 1.449 2002/05/09 19:58:39 sniper Exp $ */ /* {{{ includes */ @@ -505,8 +505,7 @@ if (prepend_string) { PUTS(prepend_string); } - php_printf(error_format, error_type_str, buffer, - error_filename, error_lineno); + php_printf(error_format, error_type_str, buffer, error_filename, error_lineno); if (PG(xmlrpc_errors)) { free_alloca(error_format); } @@ -694,9 +693,8 @@ */ static void sigchld_handler(int apar) { - while (waitpid(-1, NULL, WNOHANG) > 0) - ; - signal(SIGCHLD, sigchld_handler); + while (waitpid(-1, NULL, WNOHANG) > 0); + signal(SIGCHLD, sigchld_handler); } /* }}} */ #endif @@ -897,7 +895,7 @@ } } #else - php_os=PHP_OS; + php_os=PHP_OS; #endif #ifdef ZTS @@ -1022,7 +1020,7 @@ theese are loaded after initialization of internal extensions as extensions *might* rely on things from ext/standard which is always an internal extension and to be initialized - ahead of all other internals + ahead of all other internals */ php_ini_delayed_modules_startup(TSRMLS_C);