[vlc-devel] [PATCH] gcrypt: don't provide thread callbacks after 1.6.0

[Thomas Guillem]

---
 include/vlc_gcrypt.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/include/vlc_gcrypt.h b/include/vlc_gcrypt.h
index 89bdab8..5677d5d 100644
--- a/include/vlc_gcrypt.h
+++ b/include/vlc_gcrypt.h
@@ -25,6 +25,12 @@
 
 #include <errno.h>
 
+/**
+ * After libgcrypt 1.6.0, it is no longer supported to provide thread
+ * callbacks. Use the default thread implementation instead.
+ */
+#if GCRYPT_VERSION_NUMBER < 0x010600
+
 #ifdef LIBVLC_USE_PTHREAD
 /**
  * If possible, use gcrypt-provided thread implementation. This is so that
@@ -101,3 +107,9 @@ static inline void vlc_gcrypt_init (void)
     }
     vlc_global_unlock (VLC_GCRYPT_MUTEX);
 }
+
+#else /* GCRYPT_VERSION_NUMBER >= 0x010600 */
+
+static inline void vlc_gcrypt_init (void) {}
+
+#endif
-- 
2.1.4