MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-28 08:05:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

[-] Fix deprecated GCRY_THREAD_OPTION_PTHREAD_IMPL and GCRYCTL_SET_THREAD_CBS

Browse Source 
Looks like libgcrypt uses platform standard threading instead of asking caller
for a threading package/callbacks.
This commit is contained in:
ejurgensen 2022-05-07 10:08:54 +02:00
parent 24bf83bd90
commit c90a1c17e3
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -171,7 +171,7 @@ PKG_CHECK_EXISTS([libplist],
[OWNTONE_MODULES_CHECK([OWNTONE], [LIBPLIST], [libplist-2.0], [OWNTONE_MODULES_CHECK([OWNTONE], [LIBPLIST], [libplist-2.0],
[plist_dict_get_item], [plist/plist.h])]) [plist_dict_get_item], [plist/plist.h])])
AM_PATH_LIBGCRYPT([1:1.2.0]) AM_PATH_LIBGCRYPT([1:1.7.0])
OWNTONE_FUNC_REQUIRE([OWNTONE], [GNU Crypt Library], [LIBGCRYPT], [gcrypt], OWNTONE_FUNC_REQUIRE([OWNTONE], [GNU Crypt Library], [LIBGCRYPT], [gcrypt],
[gcry_control], [gcrypt.h]) [gcry_control], [gcrypt.h])
AM_PATH_GPG_ERROR([1.6]) AM_PATH_GPG_ERROR([1.6])

4
src/main.c
View File

@ -58,7 +58,6 @@
#include <pthread.h> #include <pthread.h>
#include <gcrypt.h> #include <gcrypt.h>
GCRY_THREAD_OPTION_PTHREAD_IMPL;
#include "conffile.h" #include "conffile.h"
#include "db.h" #include "db.h"
@ -684,9 +683,6 @@ main(int argc, char **argv)
/* Initialize libcurl */ /* Initialize libcurl */
curl_global_init(CURL_GLOBAL_DEFAULT); curl_global_init(CURL_GLOBAL_DEFAULT);
/* Initialize libgcrypt */
gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
gcry_version = gcry_check_version(GCRYPT_VERSION); gcry_version = gcry_check_version(GCRYPT_VERSION);
if (!gcry_version) if (!gcry_version)
{ {