From 2559ab0c30b6782e67c9a0a1622c04bde9ee51f5 Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Sun, 29 Apr 2012 18:48:26 +0100 Subject: [PATCH] use WSAStartup on windows, replace bzero with memset --- gdbserver/gdb-server.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gdbserver/gdb-server.c b/gdbserver/gdb-server.c index b0b43d8..bd47857 100644 --- a/gdbserver/gdb-server.c +++ b/gdbserver/gdb-server.c @@ -170,8 +170,20 @@ int main(int argc, char** argv) { current_memory_map = make_memory_map(sl); +#ifdef __MINGW32__ + WSADATA wsadata; + if (WSAStartup(MAKEWORD(2,2),&wsadata) !=0 ) { + goto winsock_error; + } +#endif + while(serve(sl, state.listen_port) == 0); +#ifdef __MINGW32__ +winsock_error: + WSACleanup(); +#endif + /* Switch back to mass storage mode before closing. */ stlink_run(sl); stlink_exit_debug_mode(sl); @@ -558,7 +570,7 @@ int serve(stlink_t *sl, int port) { setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)); struct sockaddr_in serv_addr; - bzero(&serv_addr,sizeof(struct sockaddr_in)); + memset(&serv_addr,0,sizeof(struct sockaddr_in)); serv_addr.sin_family = AF_INET; serv_addr.sin_addr.s_addr = inet_addr("127.0.0.1"); serv_addr.sin_port = htons(port); -- 2.30.2