Fix prototype of apache_child_exit_handler and remove popen-related

preprocessor directives/macros.

diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index 6c02699ad2b2adec8771f0ee05ac5b5a45db84dd..f7d6419155d3b6eea1638c691ea7777b279bac5d 100644 (file)
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -78,7 +78,7 @@ int php_xbithack_handler(request_rec * r);
 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
@@ -110,20 +110,6 @@ typedef struct _php_per_dir_entry {
        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 */
 
 /* some systems are missing these from their header files */