cvs: php4 /sapi/apache mod_php4.c

sas Mon Jul 10 02:20:35 2000 EDT Modified files: /php4/sapi/apache mod_php4.c Log: Fix prototype of apache_child_exit_handler and remove popen-related preprocessor directives/macros. Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.58 php4/sapi/apache/mod_php4.c:1.59 --- php4/sapi/apache/mod_php4.c:1.58 Mon Jul 10 00:57:01 2000 +++ php4/sapi/apache/mod_php4.c Mon Jul 10 02:20:35 2000 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.58 2000/07/10 07:57:01 thies Exp $ */ +/* $Id: mod_php4.c,v 1.59 2000/07/10 09:20:35 sas Exp $ */ #define NO_REGEX_EXTRA_H #ifdef WIN32 @@ -78,7 +78,7 @@ void php_init_handler(server_rec *s, pool *p); #if MODULE_MAGIC_NUMBER >= 19970728 -void php_child_exit_handler(server_rec *s, pool *p); +static void php_child_exit_handler(server_rec *s, pool *p); #endif #if MODULE_MAGIC_NUMBER > 19961007 @@ -109,20 +109,6 @@ uint value_length; int type; } php_per_dir_entry; - -/* handled apropriately in apache_php_module_main */ -/* popenf isn't working on Windows, use open instead -#if WIN32|WINNT -# ifdef popenf -# undef popenf -# endif -# define popenf(p,n,f,m) open((n),(f),(m)) -# ifdef pclosef -# undef pclosef -# endif -# define pclosef(p,f) close(f) -#endif -*/ php_apache_info_struct php_apache_info; /* active config */