summaryrefslogtreecommitdiffstats
path: root/locks
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-12 04:59:58 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-12 04:59:58 +0000
commitcc13dc44324dd5970d7a239e243a38d5f22cf64f (patch)
treee7429020c9c6aec4b93a84dd63b810f67dacce9c /locks
parentAdding debian version 1.7.2-3.2. (diff)
downloadapr-cc13dc44324dd5970d7a239e243a38d5f22cf64f.tar.xz
apr-cc13dc44324dd5970d7a239e243a38d5f22cf64f.zip
Merging upstream version 1.7.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'locks')
-rw-r--r--locks/unix/proc_mutex.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/locks/unix/proc_mutex.c b/locks/unix/proc_mutex.c
index ef08f93..64ffd8b 100644
--- a/locks/unix/proc_mutex.c
+++ b/locks/unix/proc_mutex.c
@@ -467,9 +467,12 @@ static const apr_proc_mutex_unix_lock_methods_t mutex_sysv_methods =
#if APR_HAS_PROC_PTHREAD_SERIALIZE
#ifndef APR_USE_PROC_PTHREAD_MUTEX_COND
-#define APR_USE_PROC_PTHREAD_MUTEX_COND \
- (defined(HAVE_PTHREAD_CONDATTR_SETPSHARED) \
- && !defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK))
+#if defined(HAVE_PTHREAD_CONDATTR_SETPSHARED) \
+ && !defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK)
+#define APR_USE_PROC_PTHREAD_MUTEX_COND 1
+#else
+#define APR_USE_PROC_PTHREAD_MUTEX_COND 0
+#endif
#endif
/* The mmap()ed pthread_interproc is the native pthread_mutex_t followed