]> granicus.if.org Git - apache/commitdiff
remove APR_HAS_THREADS check
authorEric Covener <covener@apache.org>
Mon, 26 Aug 2019 14:07:08 +0000 (14:07 +0000)
committerEric Covener <covener@apache.org>
Mon, 26 Aug 2019 14:07:08 +0000 (14:07 +0000)
no need to wrap these after r1865936

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

modules/proxy/proxy_util.c

index b4e26672dc88250c590ac2207114244b095ce525..1b528b9b1c9bac2a012eff21f38a5a54a6629bab 100644 (file)
@@ -2555,12 +2555,10 @@ ap_proxy_determine_connection(apr_pool_t *p, request_rec *r,
              * we can reuse the address.
              */
             if (!worker->cp->addr) {
-#if APR_HAS_THREADS
                 if ((err = PROXY_THREAD_LOCK(worker)) != APR_SUCCESS) {
                     ap_log_rerror(APLOG_MARK, APLOG_ERR, err, r, APLOGNO(00945) "lock");
                     return HTTP_INTERNAL_SERVER_ERROR;
                 }
-#endif
 
                 /*
                  * Worker can have the single constant backend address.
@@ -2573,11 +2571,9 @@ ap_proxy_determine_connection(apr_pool_t *p, request_rec *r,
                                             conn->port, 0,
                                             worker->cp->pool);
                 conn->addr = worker->cp->addr;
-#if APR_HAS_THREADS
                 if ((uerr = PROXY_THREAD_UNLOCK(worker)) != APR_SUCCESS) {
                     ap_log_rerror(APLOG_MARK, APLOG_ERR, uerr, r, APLOGNO(00946) "unlock");
                 }
-#endif
             }
             else {
                 conn->addr = worker->cp->addr;