]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blob - src/patches/collectd/0006-network-set_thread_cbs-so-we-initialize-the-right-th.patch
Merge remote-tracking branch 'mfischer/slang' into next
[people/pmueller/ipfire-2.x.git] / src / patches / collectd / 0006-network-set_thread_cbs-so-we-initialize-the-right-th.patch
1 From ddffda7a150cd3abdb6ec392b514a250e91e0c19 Mon Sep 17 00:00:00 2001
2 From: Chris Lundquist <chris.lundquist@github.com>
3 Date: Tue, 14 Jan 2014 18:33:13 -0800
4 Subject: [PATCH 06/22] [network] set_thread_cbs so we initialize the right
5 threading mode in gcry_check_version
6
7 Signed-off-by: Florian Forster <octo@collectd.org>
8 ---
9 src/network.c | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12 diff --git a/src/network.c b/src/network.c
13 index d0ff6bc..be82c6f 100644
14 --- a/src/network.c
15 +++ b/src/network.c
16 @@ -500,8 +500,8 @@ static void network_init_gcrypt (void) /* {{{ */
17 if (gcry_control (GCRYCTL_ANY_INITIALIZATION_P))
18 return;
19
20 - gcry_check_version (NULL); /* before calling any other functions */
21 gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
22 + gcry_check_version (NULL); /* before calling *almost* any other functions */
23 gcry_control (GCRYCTL_INIT_SECMEM, 32768);
24 gcry_control (GCRYCTL_INITIALIZATION_FINISHED);
25 } /* }}} void network_init_gcrypt */
26 --
27 1.9.3
28