[Spice-devel] [PATCH 2/2] OpenSSL from 1.1.0 is thread safe by default

[Pavel Grunt]

ack

On Thu, 2016-08-11 at 14:22 +0100, Frediano Ziglio wrote:
> Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> ---
>  server/reds.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/server/reds.c b/server/reds.c
> index f74c8d3..c3780e0 100644
> --- a/server/reds.c
> +++ b/server/reds.c
> @@ -2771,6 +2771,7 @@ static int ssl_password_cb(char *buf, int size, int
> flags, void *userdata)
>      return (strlen(pass));
>  }
>  
> +#if OPENSSL_VERSION_NUMBER < 0x1010000FL
>  static unsigned long pthreads_thread_id(void)
>  {
>      unsigned long ret;
> @@ -2808,6 +2809,11 @@ static void openssl_thread_setup(void)
>      CRYPTO_set_id_callback(pthreads_thread_id);
>      CRYPTO_set_locking_callback(pthreads_locking_callback);
>  }
> +#else
> +static inline void openssl_thread_setup(void)
> +{
> +}
> +#endif
>  
>  static gpointer openssl_global_init(gpointer arg)
>  {