Commit c458a268 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent ae896a07

STATUS

+0 −4
Original line number Diff line number Diff line
@@ -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 ]

modules/proxy/mod_proxy_hcheck.c

+1 −1
Original line number Diff line number Diff line
@@ -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;