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

diff --git a/STATUS b/STATUS
index 61242e31a84da34397c40b5acb96f6a22b264973..77c89e02293c7c663df3ad837fb7a24e6357602d 100644 (file)
--- 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 0d9e63bee009ce7827723355646a9b3803a9cb94..59684313c6a8587a481ec6db6db6379834a6a633 100644 (file)
--- 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