MonetDB: default - Also initialize winsocket in case of embedded.

[Aris Koning]

Changeset: 73e9ea871464 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/73e9ea871464
Modified Files:
        common/stream/stream.c
Branch: default
Log Message:

Also initialize winsocket in case of embedded.


diffs (31 lines):

diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -150,6 +150,7 @@ static const char *mnstr_error_kind_desc
 int
 mnstr_init(bool embedded)
 {
+       (void) embedded;
        static ATOMIC_FLAG inited = ATOMIC_FLAG_INIT;
 
        if (ATOMIC_TAS(&inited))
@@ -159,15 +160,11 @@ mnstr_init(bool embedded)
                return -1;
 
 #ifdef NATIVE_WIN32
-       if (!embedded) {
-               WSADATA w;
+       WSADATA w;
+       if (WSAStartup(0x0101, &w) != 0)
+               return -1;
+#endif
 
-               if (WSAStartup(0x0101, &w) != 0)
-                       return -1;
-       }
-#else
-       (void)embedded;
-#endif
        return 0;
 }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list