diff options
| author | Kurt Jaeger <pi@FreeBSD.org> | 2014-07-30 03:57:23 +0000 |
|---|---|---|
| committer | Kurt Jaeger <pi@FreeBSD.org> | 2014-07-30 03:57:23 +0000 |
| commit | b95d127471e2fd17cc8d189dbeec094e3ff556db (patch) | |
| tree | 15807f23c2499ac331641e73da0725c3432fea04 /editors/abiword | |
| parent | 626234f3eae064cb91ca281da3c79d84b69bf30c (diff) | |
| download | ports-b95d127471e2fd17cc8d189dbeec094e3ff556db.tar.gz ports-b95d127471e2fd17cc8d189dbeec094e3ff556db.zip | |
Notes
Diffstat (limited to 'editors/abiword')
| -rw-r--r-- | editors/abiword/files/patch-tls_tunnel.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/editors/abiword/files/patch-tls_tunnel.cpp b/editors/abiword/files/patch-tls_tunnel.cpp new file mode 100644 index 000000000000..9447b8dd855c --- /dev/null +++ b/editors/abiword/files/patch-tls_tunnel.cpp @@ -0,0 +1,17 @@ +--- plugins/collab/backends/service/xp/tls_tunnel.cpp-orig 2014-07-27 14:22:00.000000000 +0200 ++++ plugins/collab/backends/service/xp/tls_tunnel.cpp 2014-07-27 14:22:46.000000000 +0200 +@@ -124,10 +124,14 @@ + } + + static struct gcry_thread_cbs gcry_threads_tunnel = ++#if GCRYPT_VERSION_NUMBER < 0x010600 + { GCRY_THREAD_OPTION_USER, NULL, + gcry_tunnel_mutex_init, gcry_tunnel_mutex_destroy, + gcry_tunnel_mutex_lock, gcry_tunnel_mutex_unlock, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; ++#else ++{ GCRY_THREAD_OPTION_USER }; ++#endif + + bool Proxy::tls_tunnel_init() { + if (gcry_control(GCRYCTL_SET_THREAD_CBS, &tls_tunnel::gcry_threads_tunnel) != 0) |