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:
Cedric BAIL 2011-05-14 09:22:15 +00:00
parent 20566e914b
commit 541bc1158b
2 changed files with 8 additions and 4 deletions

View File

@ -172,3 +172,7 @@
* Add a custom Ecore Aniamtor source and tick ability to be able
to plug in external animator tick sources like vblank interrupts
and so on.
2011-05-14 Cedric Bail
* Sync GNUTLS threads activation with Eina.

View File

@ -23,11 +23,11 @@
static int _init_con_ssl_init_count = 0;
#if USE_GNUTLS
# ifdef EFL_HAVE_PTHREAD
#include <pthread.h>
#ifdef EINA_HAVE_THREADS
# ifdef USE_GNUTLS
GCRY_THREAD_OPTION_PTHREAD_IMPL;
# endif
#endif
static int _client_connected = 0;
# 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
_ecore_con_ssl_init_gnutls(void)
{
#ifdef EFL_HAVE_PTHREAD
#ifdef EINA_HAVE_THREADS
if (gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread))
WRN("YOU ARE USING PTHREADS, BUT I CANNOT INITIALIZE THREADSAFE GCRYPT OPERATIONS!");
#endif