X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftcpip.c;h=57f15af2459dab06ca1da257b402282d695d6df6;hb=becf0d3294d52943303c8b3646f99260912c6f4b;hp=64942aeee390622b10c194388a5bc8a853f78877;hpb=5a0398df33ef2f0ed66ef4703c13b3edae754bae;p=yaz-moved-to-github.git

diff --git a/src/tcpip.c b/src/tcpip.c
index 64942ae..57f15af 100644
--- a/src/tcpip.c
+++ b/src/tcpip.c
@@ -134,10 +134,13 @@ typedef struct tcpip_state
     int connect_response_len;
 } tcpip_state;
 
-#ifdef WIN32
 static int tcpip_init(void)
 {
+#ifdef WIN32
     static int initialized = 0;
+#endif
+    yaz_init_globals();
+#ifdef WIN32
     if (!initialized)
     {
         WORD requested;
@@ -148,14 +151,9 @@ static int tcpip_init(void)
             return 0;
         initialized = 1;
     }
+#endif
     return 1;
 }
-#else
-static int tcpip_init(void)
-{
-    return 1;
-}
-#endif
 
 /*
  * This function is always called through the cs_create() macro.
@@ -572,7 +570,6 @@ int tcpip_rcvconnect(COMSTACK h)
 #if HAVE_GNUTLS_H
     if (h->type == ssl_type && !sp->session)
     {
-        gnutls_global_init();
         tcpip_create_cred(h);
         gnutls_init(&sp->session, GNUTLS_CLIENT);
         gnutls_set_default_priority(sp->session);