httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r883816 - in /httpd/httpd/trunk: include/util_mutex.h server/util_mutex.c
Date Tue, 24 Nov 2009 19:06:17 GMT
Author: trawick
Date: Tue Nov 24 19:06:16 2009
New Revision: 883816

URL: http://svn.apache.org/viewvc?rev=883816&view=rev
Log:
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)

Modified:
    httpd/httpd/trunk/include/util_mutex.h
    httpd/httpd/trunk/server/util_mutex.c

Modified: httpd/httpd/trunk/include/util_mutex.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/util_mutex.h?rev=883816&r1=883815&r2=883816&view=diff
==============================================================================
--- httpd/httpd/trunk/include/util_mutex.h (original)
+++ httpd/httpd/trunk/include/util_mutex.h Tue Nov 24 19:06:16 2009
@@ -99,9 +99,9 @@
                                         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

Modified: httpd/httpd/trunk/server/util_mutex.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_mutex.c?rev=883816&r1=883815&r2=883816&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_mutex.c (original)
+++ httpd/httpd/trunk/server/util_mutex.c Tue Nov 24 19:06:16 2009
@@ -160,8 +160,8 @@
     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;



Mime
View raw message