summaryrefslogtreecommitdiff
path: root/sapi/apache
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2000-07-10 09:20:35 +0000
committerSascha Schumann <sas@php.net>2000-07-10 09:20:35 +0000
commit06382f01fdfa94230b086639665262a1f0c66bcc (patch)
tree3e836a3f545a49fee3ac1f0a47d65b56ee8c09cc /sapi/apache
parent1722999310d0375dcc116adb5d18023716f54cde (diff)
downloadphp-git-06382f01fdfa94230b086639665262a1f0c66bcc.tar.gz
Fix prototype of apache_child_exit_handler and remove popen-related
preprocessor directives/macros.
Diffstat (limited to 'sapi/apache')
-rw-r--r--sapi/apache/mod_php4.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index 6c02699ad2..f7d6419155 100644
--- 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 */