From: Jeff Trawick <trawick@apache.org>
Date: Tue, 24 Nov 2009 19:06:16 +0000 (+0000)
Subject: fix Win32 compile failure in r883540, reported by Gregg Smith
X-Git-Tag: 2.3.4~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1254b08e61fdd5e7c16b3ffd343bf806598eeeaa;p=apache

fix Win32 compile failure in r883540, reported by Gregg Smith

(on Win32, external APIs use one calling convention while directive
parsers use a different one)


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

diff --git a/include/util_mutex.h b/include/util_mutex.h
index b25247d5c0..a08cfc72fa 100644
--- a/include/util_mutex.h
+++ b/include/util_mutex.h
@@ -99,9 +99,9 @@ AP_DECLARE(apr_status_t) ap_parse_mutex(const char *arg, apr_pool_t *pool,
                                         const char **mutexfile);
 
 /* private function to process the Mutex directive */
-AP_DECLARE(const char *) ap_set_mutex(cmd_parms *cmd, void *dummy,
-                                      const char *typelist,
-                                      const char *mechfile);
+const char * ap_set_mutex(cmd_parms *cmd, void *dummy,
+                          const char *typelist,
+                          const char *mechfile);
 
 /**
  * option flags for ap_mutex_register(), ap_global_mutex_create(), and
diff --git a/server/util_mutex.c b/server/util_mutex.c
index dba77f751e..cb2e18bcf4 100644
--- a/server/util_mutex.c
+++ b/server/util_mutex.c
@@ -160,8 +160,8 @@ static void mx_hash_init(apr_pool_t *p)
     apr_hash_set(mxcfg_by_type, "default", APR_HASH_KEY_STRING, def);
 }
 
-AP_DECLARE(const char *) ap_set_mutex(cmd_parms *cmd, void *dummy,
-                                      const char *type, const char *mechdir)
+const char * ap_set_mutex(cmd_parms *cmd, void *dummy,
+                          const char *type, const char *mechdir)
 {
     apr_pool_t *p = cmd->pool;
     apr_lockmech_e mech;