From: havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 <>
Date: Wed, 14 Jul 2010 10:11:44 +0000 (+0000)
Subject: UNMERGE
X-Git-Tag: xonotic-v0.1.0preview~184
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=6ccb8bd7728c4b3ec67876fb0f44967c4afcbde0;p=xonotic%2Fdarkplaces.git

UNMERGE
fix more warnings in mingw

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10319 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=2abc0848d56d9c16ec587a90b4052d71e7aa6c6b
---

diff --git a/lhnet.c b/lhnet.c
index e2e513ee..2ba0fcfe 100644
--- a/lhnet.c
+++ b/lhnet.c
@@ -2,9 +2,7 @@
 // Written by Forest Hale 2003-06-15 and placed into public domain.
 
 #ifdef WIN32
-#ifdef _MSC_VER
 #pragma comment(lib, "ws2_32.lib")
-#endif
 # ifdef SUPPORTIPV6
 // Windows XP or higher is required for getaddrinfo, but the inclusion of wspiapi provides fallbacks for older versions
 # define _WIN32_WINNT 0x0501
diff --git a/sys_shared.c b/sys_shared.c
index 903bee1e..ce45820b 100644
--- a/sys_shared.c
+++ b/sys_shared.c
@@ -10,9 +10,7 @@
 # include <windows.h>
 # include <mmsystem.h> // timeGetTime
 # include <time.h> // localtime
-#ifdef _MSC_VER
 #pragma comment(lib, "winmm.lib")
-#endif
 #else
 # include <unistd.h>
 # include <fcntl.h>