You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2019/08/26 13:55:40 UTC
svn commit: r1865936 - /httpd/httpd/trunk/modules/proxy/mod_proxy.h
Author: covener
Date: Mon Aug 26 13:55:40 2019
New Revision: 1865936
URL: http://svn.apache.org/viewvc?rev=1865936&view=rev
Log:
no-op PROXY_THREAD_LOCK if !APR_HAS_THREADS
... instead of wrapping them in #if themselves in the C code.
r1852442 is a trunk-only change to make mod_proxy compile with !APR_HAS_THREADS.
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy.h
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.h?rev=1865936&r1=1865935&r2=1865936&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.h (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.h Mon Aug 26 13:55:40 2019
@@ -556,8 +556,13 @@ struct proxy_balancer_method {
apr_status_t (*updatelbstatus)(proxy_balancer *balancer, proxy_worker *elected, server_rec *s);
};
+#if APR_HAS_THREADS
#define PROXY_THREAD_LOCK(x) ( (x) && (x)->tmutex ? apr_thread_mutex_lock((x)->tmutex) : APR_SUCCESS)
#define PROXY_THREAD_UNLOCK(x) ( (x) && (x)->tmutex ? apr_thread_mutex_unlock((x)->tmutex) : APR_SUCCESS)
+#else
+#define PROXY_THREAD_LOCK(x) (APR_SUCCESS)
+#define PROXY_THREAD_UNLOCK(x) (APR_SUCCESS)
+#endif
#define PROXY_GLOBAL_LOCK(x) ( (x) && (x)->gmutex ? apr_global_mutex_lock((x)->gmutex) : APR_SUCCESS)
#define PROXY_GLOBAL_UNLOCK(x) ( (x) && (x)->gmutex ? apr_global_mutex_unlock((x)->gmutex) : APR_SUCCESS)