[myserver-commit] [3087] Properly initialize GNUTLS even in the case `GCRY_CONTROL' is not defined.

[Giuseppe Scrivano]

Revision: 3087
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3087
Author:   gscrivano
Date:     2009-05-17 19:33:58 +0000 (Sun, 17 May 2009)
Log Message:
-----------
Properly initialize GNUTLS even in the case `GCRY_CONTROL' is not defined.

Modified Paths:
--------------
    trunk/myserver/src/base/ssl/ssl.cpp
    trunk/myserver/tests/test_ssl_socket.cpp

Modified: trunk/myserver/src/base/ssl/ssl.cpp
===================================================================
--- trunk/myserver/src/base/ssl/ssl.cpp 2009-05-17 19:04:36 UTC (rev 3086)
+++ trunk/myserver/src/base/ssl/ssl.cpp 2009-05-17 19:33:58 UTC (rev 3087)
@@ -23,11 +23,9 @@
 extern "C"
 {
 #if GCRY_CONTROL
-
 #include <errno.h>
 #include <gcrypt.h>
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
-
 #endif
 
 #ifdef HAVE_PTHREAD
@@ -102,8 +100,8 @@
   {
 #if GCRY_CONTROL
     gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
-    gnutls_global_init ();
 #endif
+    gnutls_global_init ();
 
     initialized = true;
   }

Modified: trunk/myserver/tests/test_ssl_socket.cpp
===================================================================
--- trunk/myserver/tests/test_ssl_socket.cpp    2009-05-17 19:04:36 UTC (rev 
3086)
+++ trunk/myserver/tests/test_ssl_socket.cpp    2009-05-17 19:33:58 UTC (rev 
3087)
@@ -101,7 +101,7 @@
   
   void setUp ( )
   {
-    SSL_library_init ( );
+    initializeSSL ();
     u_long nbw;
     File f;