From: Jeff Trawick <trawick@apache.org>
Date: Wed, 3 Mar 2010 20:10:26 +0000 (+0000)
Subject: follow up to r918665:
X-Git-Tag: 2.3.6~400
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb70f0e3b9cde108543025bb52be1be90407222b;p=apache

follow up to r918665:

These particular functions can't be static because they're
part of ISAPI, so use a different mechanism to quiet the gcc
warnings.


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

diff --git a/modules/arch/win32/mod_isapi.c b/modules/arch/win32/mod_isapi.c
index 6c1705b614..fbac1727c5 100644
--- a/modules/arch/win32/mod_isapi.c
+++ b/modules/arch/win32/mod_isapi.c
@@ -80,6 +80,29 @@ typedef struct isapi_loaded isapi_loaded;
 apr_status_t isapi_lookup(apr_pool_t *p, server_rec *s, request_rec *r,
                           const char *fpath, isapi_loaded** isa);
 
+/* In addition to being provided via the EXTENSION_CONTROL_BLOCK,
+ * these four are also callable directly.
+ */
+int APR_THREAD_FUNC GetServerVariable (isapi_cid    *cid,
+                                       char         *variable_name,
+                                       void         *buf_ptr,
+                                       apr_uint32_t *buf_size);
+
+int APR_THREAD_FUNC ReadClient(isapi_cid    *cid,
+                               void         *buf_data,
+                               apr_uint32_t *buf_size);
+
+int APR_THREAD_FUNC WriteClient(isapi_cid    *cid,
+                                void         *buf_ptr,
+                                apr_uint32_t *size_arg,
+                                apr_uint32_t  flags);
+
+int APR_THREAD_FUNC ServerSupportFunction(isapi_cid    *cid,
+                                          apr_uint32_t  HSE_code,
+                                          void         *buf_ptr,
+                                          apr_uint32_t *buf_size,
+                                          apr_uint32_t *data_type);
+
 static void *create_isapi_dir_config(apr_pool_t *p, char *dummy)
 {
     isapi_dir_conf *dir = apr_palloc(p, sizeof(isapi_dir_conf));
@@ -485,10 +508,10 @@ struct isapi_cid {
     apr_thread_mutex_t      *completed;
 };
 
-static int APR_THREAD_FUNC GetServerVariable (isapi_cid    *cid,
-                                              char         *variable_name,
-                                              void         *buf_ptr,
-                                              apr_uint32_t *buf_size)
+int APR_THREAD_FUNC GetServerVariable (isapi_cid    *cid,
+                                       char         *variable_name,
+                                       void         *buf_ptr,
+                                       apr_uint32_t *buf_size)
 {
     request_rec *r = cid->r;
     const char *result;
@@ -587,9 +610,9 @@ static int APR_THREAD_FUNC GetServerVariable (isapi_cid    *cid,
     return 0;
 }
 
-static int APR_THREAD_FUNC ReadClient(isapi_cid    *cid,
-                                      void         *buf_data,
-                                      apr_uint32_t *buf_size)
+int APR_THREAD_FUNC ReadClient(isapi_cid    *cid,
+                               void         *buf_data,
+                               apr_uint32_t *buf_size)
 {
     request_rec *r = cid->r;
     apr_uint32_t read = 0;
@@ -804,10 +827,10 @@ static apr_ssize_t send_response_header(isapi_cid *cid,
     return ate;
 }
 
-static int APR_THREAD_FUNC WriteClient(isapi_cid    *cid,
-                                       void         *buf_ptr,
-                                       apr_uint32_t *size_arg,
-                                       apr_uint32_t  flags)
+int APR_THREAD_FUNC WriteClient(isapi_cid    *cid,
+                                void         *buf_ptr,
+                                apr_uint32_t *size_arg,
+                                apr_uint32_t  flags)
 {
     request_rec *r = cid->r;
     conn_rec *c = r->connection;
@@ -860,11 +883,11 @@ static int APR_THREAD_FUNC WriteClient(isapi_cid    *cid,
     return (rv == APR_SUCCESS);
 }
 
-static int APR_THREAD_FUNC ServerSupportFunction(isapi_cid    *cid,
-                                                 apr_uint32_t  HSE_code,
-                                                 void         *buf_ptr,
-                                                 apr_uint32_t *buf_size,
-                                                 apr_uint32_t *data_type)
+int APR_THREAD_FUNC ServerSupportFunction(isapi_cid    *cid,
+                                          apr_uint32_t  HSE_code,
+                                          void         *buf_ptr,
+                                          apr_uint32_t *buf_size,
+                                          apr_uint32_t *data_type)
 {
     request_rec *r = cid->r;
     conn_rec *c = r->connection;