libaacs | branch: refs/tags/0.8.1 | npzacs <npz...@gmail.com> | Tue Feb 17 
11:22:28 2015 +0200| [a7d441ecf004744bbb5b44fff549cfabcfe53277] | committer: 
npzacs

gcrypt thread callbacks were deprecated in 1.6.0

> http://git.videolan.org/gitweb.cgi/libaacs.git/?a=commit;h=a7d441ecf004744bbb5b44fff549cfabcfe53277
---

 src/libaacs/crypto.c |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/libaacs/crypto.c b/src/libaacs/crypto.c
index 1d3971f..57e8702 100644
--- a/src/libaacs/crypto.c
+++ b/src/libaacs/crypto.c
@@ -32,10 +32,14 @@
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
+
 #include <gcrypt.h>
+
 #ifdef HAVE_PTHREAD_H
+#if GCRYPT_VERSION_NUMBER < 0x010600
 #include <pthread.h>
 #endif
+#endif
 
 /* elliptic curve from AACS specs */
 #define AACS_EC_p   "9DC9D81355ECCEB560BDB09EF9EAE7C479A7D7DF"
@@ -52,7 +56,9 @@
 
 /* Use pthread in libgcrypt */
 #ifdef HAVE_PTHREAD_H
+# if GCRYPT_VERSION_NUMBER < 0x010600
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
+# endif
 #endif
 
 /* include some elliptic curve utils from libgcrypt */
@@ -121,7 +127,9 @@ int crypto_init()
     if (!crypto_init_check) {
         crypto_init_check = 1;
 #ifdef HAVE_PTHREAD_H
+# if GCRYPT_VERSION_NUMBER < 0x010600
         gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+# endif
 #endif
         if (!gcry_check_version(GCRYPT_VERSION)) {
             crypto_init_check = 0;

_______________________________________________
libaacs-devel mailing list
libaacs-devel@videolan.org
https://mailman.videolan.org/listinfo/libaacs-devel

Reply via email to