efl: remove checks for EINA_HAVE_THREADS
authorGustavo Sverzut Barbieri <barbieri@gmail.com>
Mon, 31 Dec 2012 17:31:17 +0000 (17:31 +0000)
committerGustavo Sverzut Barbieri <barbieri@gmail.com>
Mon, 31 Dec 2012 17:31:17 +0000 (17:31 +0000)
SVN revision: 81937

src/lib/ecore_con/ecore_con_ssl.c
src/lib/eet/eet_lib.c

index 814f03d..93fbd66 100644 (file)
@@ -52,9 +52,7 @@ EAPI int ECORE_CON_EVENT_SERVER_UPGRADE = 0;
 static int _init_con_ssl_init_count = 0;
 
 #ifdef HAVE_GNUTLS
-# ifdef EINA_HAVE_THREADS
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
-# endif
 
 static int _client_connected = 0;
 
@@ -892,10 +890,8 @@ ecore_con_ssl_client_upgrade(Ecore_Con_Client *cl, Ecore_Con_Type ssl_type)
 static Ecore_Con_Ssl_Error
 _ecore_con_ssl_init_gnutls(void)
 {
-#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
    if (gnutls_global_init())
      return ECORE_CON_SSL_ERROR_INIT_FAILED;
 
index 8dbff07..431b87a 100644 (file)
@@ -57,11 +57,9 @@ void *alloca(size_t);
 # include <openssl/evp.h>
 #endif /* ifdef HAVE_OPENSSL */
 
-#ifdef EINA_HAVE_THREADS
-# ifdef HAVE_GNUTLS
+#ifdef HAVE_GNUTLS
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
-# endif /* ifdef HAVE_GNUTLS */
-#endif /* ifdef EINA_HAVE_THREADS */
+#endif /* ifdef HAVE_GNUTLS */
 
 #include "Eet.h"
 #include "Eet_private.h"
@@ -599,12 +597,10 @@ eet_init(void)
             "BIG FAT WARNING: I AM UNABLE TO REQUEST SECMEM, Cryptographic operation are at risk !");
      }
 
-# 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 /* ifdef EINA_HAVE_THREADS */
    if (gnutls_global_init())
      goto shutdown_eet;