forked from enlightenment/efl
ecore: sync GNUTLS threads support with Eina threads support.
At least now, if you rebuild the efl in the right order, you can't end with one library initializing GnuTLS without threads support and another needing GnuTLS with threads support. SVN revision: 59379
This commit is contained in:
parent
20566e914b
commit
541bc1158b
|
@ -172,3 +172,7 @@
|
||||||
* Add a custom Ecore Aniamtor source and tick ability to be able
|
* Add a custom Ecore Aniamtor source and tick ability to be able
|
||||||
to plug in external animator tick sources like vblank interrupts
|
to plug in external animator tick sources like vblank interrupts
|
||||||
and so on.
|
and so on.
|
||||||
|
|
||||||
|
2011-05-14 Cedric Bail
|
||||||
|
|
||||||
|
* Sync GNUTLS threads activation with Eina.
|
||||||
|
|
|
@ -23,11 +23,11 @@
|
||||||
|
|
||||||
static int _init_con_ssl_init_count = 0;
|
static int _init_con_ssl_init_count = 0;
|
||||||
|
|
||||||
#if USE_GNUTLS
|
#ifdef EINA_HAVE_THREADS
|
||||||
# ifdef EFL_HAVE_PTHREAD
|
# ifdef USE_GNUTLS
|
||||||
#include <pthread.h>
|
|
||||||
GCRY_THREAD_OPTION_PTHREAD_IMPL;
|
GCRY_THREAD_OPTION_PTHREAD_IMPL;
|
||||||
# endif
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
static int _client_connected = 0;
|
static int _client_connected = 0;
|
||||||
# define SSL_SUFFIX(ssl_func) ssl_func ## _gnutls
|
# define SSL_SUFFIX(ssl_func) ssl_func ## _gnutls
|
||||||
|
@ -422,7 +422,7 @@ ecore_con_ssl_server_crl_add(Ecore_Con_Server *svr,
|
||||||
static Ecore_Con_Ssl_Error
|
static Ecore_Con_Ssl_Error
|
||||||
_ecore_con_ssl_init_gnutls(void)
|
_ecore_con_ssl_init_gnutls(void)
|
||||||
{
|
{
|
||||||
#ifdef EFL_HAVE_PTHREAD
|
#ifdef EINA_HAVE_THREADS
|
||||||
if (gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread))
|
if (gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread))
|
||||||
WRN("YOU ARE USING PTHREADS, BUT I CANNOT INITIALIZE THREADSAFE GCRYPT OPERATIONS!");
|
WRN("YOU ARE USING PTHREADS, BUT I CANNOT INITIALIZE THREADSAFE GCRYPT OPERATIONS!");
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue