From 40c893ee527f2c5c2310923b81ececa276956dd8 Mon Sep 17 00:00:00 2001 From: sezero Date: Sat, 21 Jun 2014 20:29:11 +0000 Subject: [PATCH] revert r907 (fmin()/fmax() is available with vs2012 and newer. patch from Eric Wasylishen.) git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@921 af15c1b1-3010-417e-b628-4374ebc0bcbd --- quakespasm/Quake/common.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/quakespasm/Quake/common.h b/quakespasm/Quake/common.h index 3a510588..97c89554 100644 --- a/quakespasm/Quake/common.h +++ b/quakespasm/Quake/common.h @@ -35,12 +35,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # pragma warning(disable:4267) /* 'var' : conversion from 'size_t' to 'type', possible loss of data (/Wp64 warning) */ -/* MSC has fmin() / fmax() in VS2013, and according to the - * docs, VS2012. Use the min/max macros on earlier versions: */ -#if _MSC_VER < 1700 +/* MSC doesn't have fmin() / fmax(), use the min/max macros: */ #define fmax q_max #define fmin q_min -#endif #endif /* _MSC_VER */ #endif /* _WIN32 */