Added require prototypes conditionally to CFLAGS for NETWare;

added header includes for getting protos.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@991588 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index 6b192d0463607179a3070cbfa819bb03841bbcde..b0269b350a052fb8daa17ee4ad3cd6ca1a224261 100644 (file)
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -194,7 +194,11 @@ WIN_CFLAGS += -lMSL_All_x86.lib -lkernel32.lib -luser32.lib
 # -proc PII             generate code base on Pentium II instruction set
 # -inst mmx             use MMX extensions (Not used)
 
-CFLAGS = -c -nosyspath -Cpp_exceptions off -RTTI off -align 4 -w nocmdline -proc PII 
+CFLAGS = -c -nosyspath -Cpp_exceptions off -RTTI off -align 4 -w nocmdline -proc PII
+
+ifeq "$(REQUIRE_PROTOTYPES)" "1"
+CFLAGS += -r
+endif
 
 # -g                    generate debugging information
 # -O0                   level 0 optimizations

diff --git a/modules/arch/netware/mod_netware.c b/modules/arch/netware/mod_netware.c
index a93926a6ffa6954c3a12a8a516cb38bcbbd693d3..76954cf6fb8f2fc330a99871b9ab53db73fa5f77 100644 (file)
--- a/modules/arch/netware/mod_netware.c
+++ b/modules/arch/netware/mod_netware.c
@@ -29,6 +29,7 @@
 #include "apr_optional.h"
 #include "apr_lib.h"
 #include "mod_cgi.h"
+#include "mpm_common.h"
 
 #ifdef NETWARE
 

diff --git a/modules/arch/netware/mod_nw_ssl.c b/modules/arch/netware/mod_nw_ssl.c
index 89b04836571d5c66d6508d6189c95a018955bfdd..690de8d51e2c45038cc6aaca2ef880e7a2d3479e 100644 (file)
--- a/modules/arch/netware/mod_nw_ssl.c
+++ b/modules/arch/netware/mod_nw_ssl.c
@@ -41,9 +41,11 @@
 
 #include "httpd.h"
 #include "http_config.h"
+#include "http_connection.h"
+#include "http_core.h"
 #include "http_log.h"
 #include "http_protocol.h"
-#include "http_core.h"
+#include "http_request.h"
 #include "ap_listen.h"
 #include "apr_strings.h"
 #include "apr_portable.h"
@@ -132,7 +134,7 @@ static ap_listen_rec *nw_old_listeners;
 #define get_nwssl_cfg(srv) (NWSSLSrvConfigRec *) ap_get_module_config(srv->module_config, &nwssl_module)
 
 
-static void build_cert_list (apr_pool_t *p)
+static void build_cert_list(apr_pool_t *p)
 {
     int i;
     char **rootcerts = (char **)certlist->elts;
@@ -307,7 +309,7 @@ static int make_secure_socket(apr_pool_t *pconf, const struct sockaddr_in *serve
     return s;
 }
 
-int convert_secure_socket(conn_rec *c, apr_socket_t *csd)
+static int convert_secure_socket(conn_rec *c, apr_socket_t *csd)
 {
         int rcode;
         struct tlsclientopts sWS2Opts;
@@ -370,7 +372,7 @@ int convert_secure_socket(conn_rec *c, apr_socket_t *csd)
         return rcode;
 }
 
-int SSLize_Socket(SOCKET socketHnd, char *key, request_rec *r)
+static int SSLize_Socket(SOCKET socketHnd, char *key, request_rec *r)
 {
     int rcode;
     struct tlsserveropts sWS2Opts;

diff --git a/os/netware/util_nw.c b/os/netware/util_nw.c
index bfa196e66bbdcd00e75a6a846aefc48c1d5ac235..25e0ef42a2251a60a55afe4484ef5c2bb7e13f88 100644 (file)
--- a/os/netware/util_nw.c
+++ b/os/netware/util_nw.c
@@ -16,9 +16,15 @@
 
 #include "httpd.h"
 #include "http_log.h"
+#include "ap_mpm.h"
 
 #include <netware.h>
 #include <nks/netware.h>
+#include <nks/vm.h>
+
+void ap_down_server_cb(void *, void *);
+void ap_dummy_cb(void *, void *);
+void ap_cb_destroy(void *);
 
 int nlmUnloadSignaled(int wait);
 event_handle_t eh;
@@ -35,15 +41,15 @@ AP_DECLARE(apr_status_t) ap_os_create_privileged_process(
     return apr_proc_create(newproc, progname, args, env, attr, p);
 }
 
-int  _NonAppCheckUnload( void )
+int _NonAppCheckUnload(void)
 {
-        return nlmUnloadSignaled(1);
+    return nlmUnloadSignaled(1);
 }
 
 // down server event callback
 void ap_down_server_cb(void *, void *)
 {
-        nlmUnloadSignaled(0);
+    nlmUnloadSignaled(0);
     return;
 }
 
@@ -56,10 +62,10 @@ void ap_dummy_cb(void *, void *)
 // destroy callback resources
 void ap_cb_destroy(void *)
 {
-  // cleanup down event notification
-  UnRegisterEventNotification(eh);
-  NX_UNWRAP_INTERFACE(ref);
-  NX_UNWRAP_INTERFACE(dum);
+    // cleanup down event notification
+    UnRegisterEventNotification(eh);
+    NX_UNWRAP_INTERFACE(ref);
+    NX_UNWRAP_INTERFACE(dum);
 }
 
 int _NonAppStart

diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c
index 0387f028fca70d70d7832c458f8ac280ceefadf2..7a35f3fd330ab76977115445e0dea7227d1bf999 100644 (file)
--- a/server/mpm/netware/mpm_netware.c
+++ b/server/mpm/netware/mpm_netware.c
@@ -86,6 +86,8 @@
 #include <library.h>
 #include <screen.h>
 
+int nlmUnloadSignaled(int wait);
+
 /* Limit on the total --- clients will be locked out if more servers than
  * this are needed.  It is intended solely to keep the server from crashing
  * when things get out of hand.
@@ -1095,7 +1097,7 @@ static void netware_mpm_hooks(apr_pool_t *p)
     ap_hook_mpm_get_name(netware_get_name, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
-void netware_rewrite_args(process_rec *process)
+static void netware_rewrite_args(process_rec *process)
 {
     char *def_server_root;
     char optbuf[3];