diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 4ef00c05a..77d8b30a7 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D1X-Rebirth Changelog
 
+20100704
+--------
+main/net_udp.c: Fixed Compiler-warning on Windows
+
 20100701
 --------
 2d/font.c: For gr_get_string_size introduced get_char_width_f to calculate with floats to measure non-integer font scalings; Cleanup
diff --git a/main/net_udp.c b/main/net_udp.c
index c426c918b..90094e267 100644
--- a/main/net_udp.c
+++ b/main/net_udp.c
@@ -207,6 +207,7 @@ int udp_open_socket(int socknum, int port)
 		udp_close_socket(socknum);
 		return -1;
 	}
+	(void)setsockopt( UDP_Socket[socknum], SOL_SOCKET, SO_BROADCAST, (const char *) &bcast, sizeof(bcast) );
 #else
 	struct addrinfo hints,*res,*sres;
 	int err,ai_family_;
@@ -269,8 +270,8 @@ int udp_open_socket(int socknum, int port)
 		con_printf(CON_URGENT,"udp_open_socket (getaddrinfo):%s\n", gai_strerror (err));
 		nm_messagebox(TXT_ERROR,1,TXT_OK,"Could not get address information:\n%s",gai_strerror (err));
 	}
-#endif
 	setsockopt( UDP_Socket[socknum], SOL_SOCKET, SO_BROADCAST, &bcast, sizeof(bcast) );
+#endif
 
 	return 0;
 	}