You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/07/27 02:04:12 UTC
cvs commit: apache-2.0/src/modules/mpm/spmt_os2 mpm.h
rbb 00/07/26 17:04:11
Modified: src/main mpm_common.c
src/modules/mpm/prefork mpm.h
src/modules/mpm/spmt_os2 mpm.h
Log:
Cleanup the MPM #defines. Each MPM #defines a unique name that identifies
it to the system. That name should be of the format NAME_MPM where name
is something like DEXTER, MPMT_PTHREAD, SPMT_OS2, etc.
Revision Changes Path
1.27 +2 -2 apache-2.0/src/main/mpm_common.c
Index: mpm_common.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/mpm_common.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mpm_common.c 2000/07/26 18:07:33 1.26
+++ mpm_common.c 2000/07/27 00:04:11 1.27
@@ -81,10 +81,10 @@
#include <sys/socket.h> /* for setsockopt prototype */
#endif
-#if defined(DEXTER) || defined(DEXTER_MPM) || defined(MPMT_BEOS_MPM) || defined(BEOS_MPM)
+#if defined(DEXTER_MPM) || defined(MPMT_BEOS_MPM) || defined(BEOS_MPM) || defined(PERCHILD)
#define CHILD_TABLE 1
#define CHILD_INFO_TABLE ap_child_table
-#elif defined(MPMT_PTHREAD) || defined (PREFORK) || defined(PREFORK_MPM)
+#elif defined(MPMT_PTHREAD) || defined(PREFORK_MPM)
#define SCOREBOARD 1
#define CHILD_INFO_TABLE ap_scoreboard_image->parent
#endif
1.4 +1 -1 apache-2.0/src/modules/mpm/prefork/mpm.h
Index: mpm.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/mpm.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mpm.h 2000/07/10 18:21:22 1.3
+++ mpm.h 2000/07/27 00:04:11 1.4
@@ -71,4 +71,4 @@
extern server_rec *ap_server_conf;
extern int ap_my_pid;
extern char ap_coredump_dir[MAX_STRING_LEN];
-#endif /* APACHE_MPM_DEXTER_H */
+#endif /* APACHE_MPM_PREFORK_H */
1.4 +1 -1 apache-2.0/src/modules/mpm/spmt_os2/mpm.h
Index: mpm.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/spmt_os2/mpm.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mpm.h 2000/07/14 14:45:32 1.3
+++ mpm.h 2000/07/27 00:04:11 1.4
@@ -68,4 +68,4 @@
extern char ap_coredump_dir[MAX_STRING_LEN];
extern server_rec *ap_server_conf;
-#endif /* APACHE_MPM_DEXTER_H */
+#endif /* APACHE_MPM_SPMT_OS2_H */