From: Jim Jagielski <jim@apache.org>
Date: Wed, 3 Aug 2016 11:44:41 +0000 (+0000)
Subject: Merge r1753777 from trunk:
X-Git-Tag: 2.4.24~344
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1277e6ee454853fc8a7c74006094506269a43679;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1753777 from trunk:

Permit mod_proxy_hcheck.c to compile on Win32 32-bit architectures.
This decoration is required for all apr_thread fn() entry points,
at least on some platforms.


Submitted by: wrowe
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1755072 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index ce0657e16dd..41fc3b8ecfd 100644
--- a/STATUS
+++ b/STATUS
@@ -124,10 +124,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_proxy_hcheck: fix thread_fn entry point for win32 32-bit
-     trunk patch: http://svn.apache.org/r1753777
-     2.4.x patch: trunk works
-     +1: wrowe, covener, jchampion
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/modules/proxy/mod_proxy_hcheck.c b/modules/proxy/mod_proxy_hcheck.c
index 6606652e392..0143fd45a5e 100644
--- a/modules/proxy/mod_proxy_hcheck.c
+++ b/modules/proxy/mod_proxy_hcheck.c
@@ -775,7 +775,7 @@ static apr_status_t hc_check_http(sctx_t *ctx, apr_pool_t *ptemp, proxy_worker *
     return backend_cleanup("HCOH", backend, ctx->s, status);
 }
 
-static void *hc_check(apr_thread_t *thread, void *b)
+static void * APR_THREAD_FUNC hc_check(apr_thread_t *thread, void *b)
 {
     baton_t *baton = (baton_t *)b;
     sctx_t *ctx = baton->ctx;