WSAStartup and WSACleanup are called properly in nanomsg library, removed

them from biruda.c

2 files changed, 2 insertions, 30 deletions

diff --git a/src/NMakefile b/src/NMakefile
index 2568238..73c30ea 100644
--- a/src/NMakefile
+++ b/src/NMakefile
@@ -59,7 +59,7 @@ clean:
 	@-erase biruda.exe 2>NUL
 	@-erase biruda_cmdline.h  biruda_cmdline.c 2>NUL
 
-run:
+run: all
 	@-copy $(CONFUSE_DIR)\bin\libConfuse.dll .
 	@-copy $(PTHREADS_W32_DIR)\pthreadVC2d.dll .
 	@-copy $(NANOMSG_DIR)\bin\nanomsg.dll .
diff --git a/src/biruda.c b/src/biruda.c
index 535c49f..952e09c 100644
--- a/src/biruda.c
+++ b/src/biruda.c
@@ -1,10 +1,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#ifdef _WIN32
-#include <Winsock2.h>
-#include <ws2tcpip.h>
-#else
+#ifndef _WIN32
 #include <errno.h>
 #include <unistd.h>
 #endif
@@ -180,30 +177,12 @@ int main( int argc, char *argv[] )
 		return( ( test_config( &args_info ) == 0 ) ? EXIT_SUCCESS : EXIT_FAILURE );
 	}
 
-#ifdef _WIN32
-	WORD version;
-	WSADATA data;
-	int rc;
-	
-	version = MAKEWORD( 2, 2 );
-	rc = WSAStartup( version, &data );
-	if( rc != 0 ) {
-		fprintf( stderr, "ERROR: WSAStartup failed with error: %d\n", rc );
-		cfg_free( cfg );
-		cmdline_parser_free( &args_info );
-		exit( EXIT_FAILURE );
-	}		
-#endif
-
 	unsigned int has_master = cfg_size( cfg, "master" );
 	if( has_master ) {
 		if( create_master( cfg ) != 0 ) {
 			fprintf( stderr, "FATAL: Unable to create master thread!\n" );
 			cfg_free( cfg );
 			cmdline_parser_free( &args_info );
-#ifdef _WIN32
-			WSACleanup( );
-#endif
 			exit( EXIT_FAILURE );
 		}
 	}
@@ -214,9 +193,6 @@ int main( int argc, char *argv[] )
 			fprintf( stderr, "FATAL: Unable to create coordinator thread!\n" );
 			cfg_free( cfg );
 			cmdline_parser_free( &args_info );
-#ifdef _WIN32
-			WSACleanup( );
-#endif
 			exit( EXIT_FAILURE );
 		}
 	}
@@ -240,9 +216,5 @@ int main( int argc, char *argv[] )
 	cfg_free( cfg );
 	cmdline_parser_free( &args_info );
 
-#ifdef _WIN32
-		WSACleanup( );
-#endif
-
 	exit( EXIT_SUCCESS );
 }