manoj 99/11/15 19:00:46
Modified: src/modules/mpm/dexter dexter.c dexter.h
Log:
ap_clean_child_exit is static in dexter now, and the ap_ prefix is gone.
Revision Changes Path
1.55 +5 -6 apache-2.0/src/modules/mpm/dexter/dexter.c
Index: dexter.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -u -r1.54 -r1.55
--- dexter.c 1999/11/15 22:26:35 1.54
+++ dexter.c 1999/11/16 03:00:38 1.55
@@ -187,9 +187,8 @@
return (server_conf);
}
-/* a clean exit from a child with proper cleanup
- static void ap_clean_child_exit(int code) __attribute__ ((noreturn)); */
-void ap_clean_child_exit(int code)
+/* a clean exit from a child with proper cleanup */
+static void clean_child_exit(int code)
{
if (pchild) {
ap_destroy_pool(pchild);
@@ -463,7 +462,7 @@
static void just_die(int sig)
{
- ap_clean_child_exit(0);
+ clean_child_exit(0);
}
/*****************************************************************
@@ -1012,11 +1011,11 @@
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_EMERG, rv, server_conf,
"Couldn't initialize cross-process lock in child");
- ap_clean_child_exit(APEXIT_CHILDFATAL);
+ clean_child_exit(APEXIT_CHILDFATAL);
}
if (unixd_setup_child()) {
- ap_clean_child_exit(APEXIT_CHILDFATAL);
+ clean_child_exit(APEXIT_CHILDFATAL);
}
ap_child_init_hook(pchild, server_conf);
1.5 +0 -1 apache-2.0/src/modules/mpm/dexter/dexter.h
Index: dexter.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -u -r1.4 -r1.5
--- dexter.h 1999/08/28 13:00:35 1.4
+++ dexter.h 1999/11/16 03:00:42 1.5
@@ -59,6 +59,5 @@
#define APACHE_MPM_DEXTER_H
extern int max_daemons_limit;
-extern void ap_clean_child_exit(int);
#endif /* APACHE_MPM_DEXTER_H */