c0565f0da1
Thread removal were incomplete, it has broken some dlz modules compilation. Ensure threaded variant is always used, remove remains of single-thread variant.
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From ed812b09c091ba31c0c14b597ddbcfab47ce1cf3 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
|
|
Date: Fri, 21 Jan 2022 18:19:04 +0100
|
|
Subject: [PATCH] Correct #ifdef broken by pthread removal
|
|
|
|
Commit 2bf7921c7e93d43fa32fcfc9cd8e20d26c5f2084 has broken building of
|
|
ldap module. Initial #ifdef PTHREADS were removed without removing also
|
|
else and endif parts. DLZ modules do not compile anymore.
|
|
---
|
|
contrib/dlz/modules/include/dlz_pthread.h | 8 --------
|
|
1 file changed, 8 deletions(-)
|
|
|
|
diff --git a/contrib/dlz/modules/include/dlz_pthread.h b/contrib/dlz/modules/include/dlz_pthread.h
|
|
index c1b6db637e..10619d39b9 100644
|
|
--- a/contrib/dlz/modules/include/dlz_pthread.h
|
|
+++ b/contrib/dlz/modules/include/dlz_pthread.h
|
|
@@ -26,13 +26,5 @@
|
|
#define dlz_mutex_lock pthread_mutex_lock
|
|
#define dlz_mutex_trylock pthread_mutex_trylock
|
|
#define dlz_mutex_unlock pthread_mutex_unlock
|
|
-#else /* !PTHREADS */
|
|
-#define dlz_mutex_t void
|
|
-#define dlz_mutex_init(a, b) (0)
|
|
-#define dlz_mutex_destroy(a) (0)
|
|
-#define dlz_mutex_lock(a) (0)
|
|
-#define dlz_mutex_trylock(a) (0)
|
|
-#define dlz_mutex_unlock(a) (0)
|
|
-#endif /* ifdef PTHREADS */
|
|
|
|
#endif /* DLZ_PTHREAD_H */
|
|
--
|
|
2.31.1
|
|
|