X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=75a6bed08be6dcb48532c4b7b10561e9031a5877;hb=08589462adf3f81b480faacecb8352428212a2f5;hp=0f977a76c81515ab44ad348b99f296205b2c1728;hpb=8fc5a9a5e90ba1c7580e9d883aed0d790e594c8e;p=fw%2Fopenocd

diff --git a/src/server/server.c b/src/server/server.c
index 0f977a76c..75a6bed08 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -28,7 +28,7 @@
 #endif
 
 #include "server.h"
-#include "target.h"
+#include <target/target.h>
 #include "openocd.h"
 #include "tcl_server.h"
 #include "telnet_server.h"
@@ -487,8 +487,12 @@ void sig_handler(int sig) {
 }
 #endif
 
-int server_init(struct command_context *cmd_ctx)
+int server_preinit(void)
 {
+	/* this currently only calls WSAStartup on native win32 systems
+	 * before any socket operations are performed.
+	 * This is an issue if you call init in your config script */
+
 #ifdef _WIN32
 	WORD wVersionRequested;
 	WSADATA wsaData;
@@ -518,6 +522,11 @@ int server_init(struct command_context *cmd_ctx)
 	signal(SIGABRT, sig_handler);
 #endif
 
+	return ERROR_OK;
+}
+
+int server_init(struct command_context *cmd_ctx)
+{
 	int ret = tcl_init(cmd_ctx);
 	if (ERROR_OK != ret)
 		return ret;