You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@locus.apache.org on 2000/07/26 20:07:36 UTC
cvs commit: apache-2.0/src/modules/mpm/dexter scoreboard.c
trawick 00/07/26 11:07:35
Modified: src/main mpm_common.c
src/modules/mpm/dexter scoreboard.c
Log:
Fix some build issues for dexter:
. dexter/scoreboard.c needed apr_strings.h to get the right
function prototypes
. main/mpm_common.c needed to recognize that we were building
for dexter; otherwise, no ap_reclaim_child_processes() was
compiled and linking failed
(It would be nice to standardize on which preprocessor symbols
are checked for... mpmname_MPM seems nice enough. Didn't the
check for symbol mpmname (no "_MPM") come with mpmt.c?)
Revision Changes Path
1.26 +1 -1 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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mpm_common.c 2000/07/26 14:12:38 1.25
+++ mpm_common.c 2000/07/26 18:07:33 1.26
@@ -81,7 +81,7 @@
#include <sys/socket.h> /* for setsockopt prototype */
#endif
-#if defined(DEXTER) || defined(MPMT_BEOS_MPM) || defined(BEOS_MPM)
+#if defined(DEXTER) || defined(DEXTER_MPM) || defined(MPMT_BEOS_MPM) || defined(BEOS_MPM)
#define CHILD_TABLE 1
#define CHILD_INFO_TABLE ap_child_table
#elif defined(MPMT_PTHREAD) || defined (PREFORK) || defined(PREFORK_MPM)
1.19 +1 -0 apache-2.0/src/modules/mpm/dexter/scoreboard.c
Index: scoreboard.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/scoreboard.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- scoreboard.c 2000/06/21 23:00:03 1.18
+++ scoreboard.c 2000/07/26 18:07:34 1.19
@@ -56,6 +56,7 @@
* University of Illinois, Urbana-Champaign.
*/
+#include "apr_strings.h"
#include "ap_config.h"
#include "httpd.h"
#include "http_log.h"
Re: cvs commit: apache-2.0/src/modules/mpm/dexter scoreboard.c
Posted by Manoj Kasichainula <ma...@io.com>.
On Wed, Jul 26, 2000 at 06:07:36PM -0000, trawick@locus.apache.org wrote:
> (It would be nice to standardize on which preprocessor symbols
> are checked for... mpmname_MPM seems nice enough.
Sounds reasonable. I think we should completely avoid checking for
particular MPMs though. If we ever find ourselves needing to check for
dexter specfically, something is wrong with the abstraction and it
should be fixed.
The only reason I didn't take the #defines out when I made my
mpm_common.c patch is that the #defines might be useful if a module
author needs to check for bugs.
Re: cvs commit: apache-2.0/src/modules/mpm/dexter scoreboard.c
Posted by Greg Stein <gs...@lyra.org>.
On Wed, Jul 26, 2000 at 07:36:28PM +0100, David Reid wrote:
> > (It would be nice to standardize on which preprocessor symbols
> > are checked for... mpmname_MPM seems nice enough. Didn't the
> > check for symbol mpmname (no "_MPM") come with mpmt.c?)
> >
>
> Agreed. We should be standardising this. mpmname_MPM seems fair enough.
Euh... how about some namespace protection here?
I'd vote for: AP_MPM_*
Cheers,
-g
--
Greg Stein, http://www.lyra.org/
Re: cvs commit: apache-2.0/src/modules/mpm/dexter scoreboard.c
Posted by David Reid <dr...@jetnet.co.uk>.
> (It would be nice to standardize on which preprocessor symbols
> are checked for... mpmname_MPM seems nice enough. Didn't the
> check for symbol mpmname (no "_MPM") come with mpmt.c?)
>
Agreed. We should be standardising this. mpmname_MPM seems fair enough.