From: Jeff Trawick <trawick@apache.org>
Date: Mon, 18 Sep 2000 19:30:23 +0000 (+0000)
Subject: Fix the calling convention on Windows for ap_bucket_printf() and
X-Git-Tag: APACHE_2_0_ALPHA_7~143
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b528a5f825822f5c8aaf430ab14b9e12d4a9dff8;p=apache

Fix the calling convention on Windows for ap_bucket_printf() and
ap_method_list_do().


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

diff --git a/include/http_protocol.h b/include/http_protocol.h
index 7a6921bd5b..1e4f2ef299 100644
--- a/include/http_protocol.h
+++ b/include/http_protocol.h
@@ -265,10 +265,10 @@ API_EXPORT(size_t) ap_send_mmap(apr_mmap_t *mm, request_rec *r, size_t offset,
 API_EXPORT(ap_method_list_t *) ap_make_method_list(apr_pool_t *p, int nelts);
 API_EXPORT(void) ap_copy_method_list(ap_method_list_t *dest,
 				     ap_method_list_t *src);
-API_EXPORT(void) ap_method_list_do(int (*comp) (void *urec, const char *mname,
-						int mnum),
-				   void *rec,
-				   const ap_method_list_t *ml, ...);
+API_EXPORT_NONSTD(void) ap_method_list_do(int (*comp) (void *urec, const char *mname,
+						       int mnum),
+				          void *rec,
+				          const ap_method_list_t *ml, ...);
 API_EXPORT(void) ap_method_list_vdo(int (*comp) (void *urec, const char *mname,
 						 int mnum),
 				    void *rec, const ap_method_list_t *ml,
diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index e7cc8f0a86..cc208887e3 100644
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -1683,10 +1683,10 @@ API_EXPORT(void) ap_copy_method_list(ap_method_list_t *dest,
 /*
  * Invoke a callback routine for each method in the specified list.
  */
-API_EXPORT(void) ap_method_list_do(int (*comp) (void *urec, const char *mname,
-						int mnum),
-				   void *rec,
-				   const ap_method_list_t *ml, ...)
+API_EXPORT_NONSTD(void) ap_method_list_do(int (*comp) (void *urec, const char *mname,
+						       int mnum),
+				          void *rec,
+				          const ap_method_list_t *ml, ...)
 {
     va_list vp;
     va_start(vp, ml);