httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r991588 - in /httpd/httpd/trunk: build/NWGNUenvironment.inc modules/arch/netware/mod_netware.c modules/arch/netware/mod_nw_ssl.c os/netware/util_nw.c server/mpm/netware/mpm_netware.c
Date Wed, 01 Sep 2010 16:17:24 GMT
Author: fuankg
Date: Wed Sep  1 16:17:23 2010
New Revision: 991588

URL: http://svn.apache.org/viewvc?rev=991588&view=rev
Log:
Added require prototypes conditionally to CFLAGS for NETWare;
added header includes for getting protos.

Modified:
    httpd/httpd/trunk/build/NWGNUenvironment.inc
    httpd/httpd/trunk/modules/arch/netware/mod_netware.c
    httpd/httpd/trunk/modules/arch/netware/mod_nw_ssl.c
    httpd/httpd/trunk/os/netware/util_nw.c
    httpd/httpd/trunk/server/mpm/netware/mpm_netware.c

Modified: httpd/httpd/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUenvironment.inc?rev=991588&r1=991587&r2=991588&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/trunk/build/NWGNUenvironment.inc Wed Sep  1 16:17:23 2010
@@ -194,7 +194,11 @@ WIN_CFLAGS += -lMSL_All_x86.lib -lkernel
 # -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

Modified: httpd/httpd/trunk/modules/arch/netware/mod_netware.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/netware/mod_netware.c?rev=991588&r1=991587&r2=991588&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/netware/mod_netware.c (original)
+++ httpd/httpd/trunk/modules/arch/netware/mod_netware.c Wed Sep  1 16:17:23 2010
@@ -29,6 +29,7 @@
 #include "apr_optional.h"
 #include "apr_lib.h"
 #include "mod_cgi.h"
+#include "mpm_common.h"
 
 #ifdef NETWARE
 

Modified: httpd/httpd/trunk/modules/arch/netware/mod_nw_ssl.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/netware/mod_nw_ssl.c?rev=991588&r1=991587&r2=991588&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/netware/mod_nw_ssl.c (original)
+++ httpd/httpd/trunk/modules/arch/netware/mod_nw_ssl.c Wed Sep  1 16:17:23 2010
@@ -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
     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, a
         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;

Modified: httpd/httpd/trunk/os/netware/util_nw.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/netware/util_nw.c?rev=991588&r1=991587&r2=991588&view=diff
==============================================================================
--- httpd/httpd/trunk/os/netware/util_nw.c (original)
+++ httpd/httpd/trunk/os/netware/util_nw.c Wed Sep  1 16:17:23 2010
@@ -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_pr
     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

Modified: httpd/httpd/trunk/server/mpm/netware/mpm_netware.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/netware/mpm_netware.c?rev=991588&r1=991587&r2=991588&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/netware/mpm_netware.c (original)
+++ httpd/httpd/trunk/server/mpm/netware/mpm_netware.c Wed Sep  1 16:17:23 2010
@@ -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
     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];



Mime
View raw message