diff options
| author | Ruediger Pluem <rpluem@apache.org> | 2012-03-21 16:18:28 +0100 |
|---|---|---|
| committer | Ruediger Pluem <rpluem@apache.org> | 2012-03-21 16:18:28 +0100 |
| commit | 2ee35476b3a09d91d448f7ca9c19868efd1903dc (patch) | |
| tree | bae0aedcae1904500bdddbd7e8b8e54f61d28456 /server/mpm_unix.c | |
| parent | Revert r1294936 (Jeff's revert) and fix NetWare / Win32 build. (diff) | |
| download | apache2-2ee35476b3a09d91d448f7ca9c19868efd1903dc.tar.xz apache2-2ee35476b3a09d91d448f7ca9c19868efd1903dc.zip | |
* Fix changes in parameter names in function definitions done in r1303201
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1303435 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/mpm_unix.c')
| -rw-r--r-- | server/mpm_unix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/mpm_unix.c b/server/mpm_unix.c index 4a0de7b944..e8eeb0713e 100644 --- a/server/mpm_unix.c +++ b/server/mpm_unix.c @@ -100,7 +100,7 @@ AP_DECLARE(int) ap_unregister_extra_mpm_process(pid_t pid, ap_generation_t *old_ else { extras = cur->next; } - *gen = cur->gen; + *old_gen = cur->gen; free(cur); return 1; /* found */ } @@ -937,7 +937,7 @@ AP_DECLARE(apr_status_t) ap_fatal_signal_setup(server_rec *s, #endif /* NO_USE_SIGACTION */ - pconf = in_pconf; + pconf = pconf; parent_pid = my_pid = getpid(); return APR_SUCCESS; |