From 6faff0620a8dd9fc2a70eb08ca14d36e1b4e275c Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Mon, 10 Mar 2014 11:52:26 +0000 Subject: [PATCH] Merge r1423933 from trunk: On NetWare skip these unsupported function prototypes. Submitted by: fuankg Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1575914 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 5 ----- include/mpm_common.h | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/STATUS b/STATUS index 61242e31a8..77c89e0229 100644 --- a/STATUS +++ b/STATUS @@ -97,11 +97,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - - *) includes: skip unsupported function prototypes on NetWare too. - trunk patch: http://svn.apache.org/r1423933 - 2.4.x patch: trunk works (with offset) - +1: fuankg, trawick, jim diff --git a/include/mpm_common.h b/include/mpm_common.h index 0d9e63bee0..59684313c6 100644 --- a/include/mpm_common.h +++ b/include/mpm_common.h @@ -233,7 +233,7 @@ AP_DECLARE(gid_t) ap_gname2id(const char *name); int initgroups(const char *name, gid_t basegid); #endif -#if !defined(WIN32) || defined(DOXYGEN) +#if (!defined(WIN32) && !defined(NETWARE)) || defined(DOXYGEN) typedef struct ap_pod_t ap_pod_t; @@ -321,7 +321,7 @@ AP_DECLARE(apr_status_t) ap_mpm_podx_signal(ap_pod_t *pod, AP_DECLARE(void) ap_mpm_podx_killpg(ap_pod_t *pod, int num, ap_podx_restart_t graceful); -#endif /* !WIN32 || DOXYGEN */ +#endif /* (!WIN32 && !NETWARE) || DOXYGEN */ /** * Check that exactly one MPM is loaded -- 2.40.0