From: Guenter Knauf <fuankg@apache.org>
Date: Sat, 2 Apr 2011 14:14:01 +0000 (+0000)
Subject: Sync'd with fixes from trunk.
X-Git-Tag: 2.2.18~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed824121105cbd4709b636f5c575b4556f06ce7e;p=thirdparty%2Fapache%2Fhttpd.git

Sync'd with fixes from trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1088031 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/os/netware/util_nw.c b/os/netware/util_nw.c
index bfa196e66bb..97845d47374 100644
--- 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,31 +41,31 @@ 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 *)
+/* down server event callback */
+void ap_down_server_cb(void *a, void *b)
 {
-        nlmUnloadSignaled(0);
+    nlmUnloadSignaled(0);
     return;
 }
 
-// Required place holder event callback
-void ap_dummy_cb(void *, void *)
+/* Required place holder event callback */
+void ap_dummy_cb(void *a, void *b)
 {
     return;
 }
 
-// destroy callback resources
-void ap_cb_destroy(void *)
+/* destroy callback resources */
+void ap_cb_destroy(void *a)
 {
-  // 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
@@ -88,7 +94,7 @@ int _NonAppStart
 #pragma unused(messageCount)
 #pragma unused(messages)
 
-    // register for down server event
+    /* register for down server event */
     rtag_t rt = AllocateResourceTag(NLMHandle, "Apache2 Down Server Callback",
                                     EventSignature);
 
@@ -98,8 +104,9 @@ int _NonAppStart
                                       EVENT_PRIORITY_APPLICATION,
                                       ref, dum, NULL);
 
-    // clean-up
+    /* clean-up */
     NXVmRegisterExitHandler(ap_cb_destroy, NULL);
 
+    return 0;
 }