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 e2e513ee7bfdbc1d73b145a13f7ae7bb11ef889e..2ba0fcfe743ef2513754790e657d283012725395 100644 (file)
--- 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 903bee1e6868edbe8363ea1791f2f5fdefccfcd8..ce45820b4c689ca705d97f3d5956cb38e4cd0cbd 100644 (file)
--- 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>