diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-12 04:59:59 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-12 04:59:59 +0000 |
| commit | 052282b2d174632c62327a1ccd2d839e8ab3ec9e (patch) | |
| tree | 9604f20f0dc601f1b8f34d0adbd9fcdc57140b2d /locks/unix | |
| parent | Releasing progress-linux version 1.7.2-3.2~progress7.99u1. (diff) | |
| download | apr-052282b2d174632c62327a1ccd2d839e8ab3ec9e.tar.xz apr-052282b2d174632c62327a1ccd2d839e8ab3ec9e.zip | |
Merging upstream version 1.7.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'locks/unix')
| -rw-r--r-- | locks/unix/proc_mutex.c | 9 |
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 |