diff options
| author | Jeff Trawick <trawick@apache.org> | 2001-08-13 18:42:13 +0200 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2001-08-13 18:42:13 +0200 |
| commit | f29b938e84e3cbddf155ed01da6b5fbea412cbde (patch) | |
| tree | 868eea80fcb6452c4645363577a345b04b719da3 /server/mpm_common.c | |
| parent | allow non-Unix MPMs to use mpm_common.c by not automatically (diff) | |
| download | apache2-f29b938e84e3cbddf155ed01da6b5fbea412cbde.tar.xz apache2-f29b938e84e3cbddf155ed01da6b5fbea412cbde.zip | |
(hopefully) get WinNT MPM to build using mpm_common.c code; a few notes:
. the selection of ap_sock_disable() is certainly ugly, but that may
need to be cleaned up in a different manner...
. the directive functions couldn't be AP_DECLARE() if they are to be
compatible with AP_INIT_TAKExxx(); this is an old restriction
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90138 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
| -rw-r--r-- | server/mpm_common.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/server/mpm_common.c b/server/mpm_common.c index a8240026fd..883db93294 100644 --- a/server/mpm_common.c +++ b/server/mpm_common.c @@ -271,7 +271,7 @@ void ap_process_child_status(apr_proc_t *pid, apr_wait_t status) } #endif /* AP_MPM_WANT_PROCESS_CHILD_STATUS */ -#if defined(TCP_NODELAY) && !defined(MPE) && !defined(TPF) +#if defined(TCP_NODELAY) && !defined(MPE) && !defined(TPF) && !defined(WIN32) void ap_sock_disable_nagle(apr_socket_t *s) { /* The Nagle algorithm says that we should delay sending partial @@ -485,8 +485,8 @@ void ap_mpm_pod_killpg(ap_pod_t *pod, int num) #ifdef AP_MPM_WANT_SET_PIDFILE const char *ap_pid_fname = NULL; -AP_DECLARE(const char *)ap_mpm_set_pidfile(cmd_parms *cmd, void *dummy, - const char *arg) +const char *ap_mpm_set_pidfile(cmd_parms *cmd, void *dummy, + const char *arg) { const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY); if (err != NULL) { @@ -532,8 +532,8 @@ AP_DECLARE(const char *) ap_mpm_set_lockfile(cmd_parms *cmd, void *dummy, #ifdef AP_MPM_WANT_SET_MAX_REQUESTS int ap_max_requests_per_child = 0; -AP_DECLARE(const char *) ap_mpm_set_max_requests(cmd_parms *cmd, void *dummy, - const char *arg) +const char *ap_mpm_set_max_requests(cmd_parms *cmd, void *dummy, + const char *arg) { const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY); if (err != NULL) { @@ -548,8 +548,8 @@ AP_DECLARE(const char *) ap_mpm_set_max_requests(cmd_parms *cmd, void *dummy, #ifdef AP_MPM_WANT_SET_COREDUMPDIR char ap_coredump_dir[MAX_STRING_LEN]; -AP_DECLARE(const char *) ap_mpm_set_coredumpdir(cmd_parms *cmd, void *dummy, - const char *arg) +const char *ap_mpm_set_coredumpdir(cmd_parms *cmd, void *dummy, + const char *arg) { apr_finfo_t finfo; const char *fname; |