]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
UNMERGE
authorhavoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 <>
Tue, 24 Aug 2010 17:16:29 +0000 (17:16 +0000)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 24 Sep 2010 20:00:28 +0000 (22:00 +0200)
fix previous warning fix that only worked properly for MINGW

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10417 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=1e6056400d6d93a7045ffc6be5546c7468a243f3

lhnet.c

diff --git a/lhnet.c b/lhnet.c
index 0d32a0c55b23024569faf0da1cef7dea9a25e5aa..aa6cbc94153b5f6c9f65f8960ed835515a61ce63 100644 (file)
--- a/lhnet.c
+++ b/lhnet.c
@@ -839,7 +839,7 @@ void LHNET_SleepUntilPacket_Microseconds(int microseconds)
                {
                        if (lastfd < s->inetsocket)
                                lastfd = s->inetsocket;
-#if defined(WIN32) && !defined(_MSC_VER)
+#ifdef WIN32
                        FD_SET((int)s->inetsocket, &fdreadset);
 #else
                        FD_SET((unsigned int)s->inetsocket, &fdreadset);