From: havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 <> Date: Tue, 24 Aug 2010 17:16:29 +0000 (+0000) Subject: UNMERGE X-Git-Tag: xonotic-v0.1.0preview~198 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bbdd576471843ae0f2f400e3c60fd643e669d90d;p=xonotic%2Fdarkplaces.git UNMERGE 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 --- diff --git a/lhnet.c b/lhnet.c index 0d32a0c5..aa6cbc94 100644 --- 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);