diff options
author | marha <marha@users.sourceforge.net> | 2013-10-24 08:15:59 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-10-24 08:15:59 +0200 |
commit | 285b1bd8933288fc56259cfb3de61207c8e35d9e (patch) | |
tree | 2107aaa7f683f16a9a1a73e5f6f2d7ba53710f32 /mesalib/src/mesa/main/querymatrix.c | |
parent | c665b6e88274f8bc603b0f14f92bf09d2023bd4d (diff) | |
parent | 4eb0b643ad978d94837e2d587a5d4358f974a25c (diff) | |
download | vcxsrv-285b1bd8933288fc56259cfb3de61207c8e35d9e.tar.gz vcxsrv-285b1bd8933288fc56259cfb3de61207c8e35d9e.tar.bz2 vcxsrv-285b1bd8933288fc56259cfb3de61207c8e35d9e.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver git update 24 oct 2013
Conflicts:
xorg-server/glx/glxdricommon.c
Diffstat (limited to 'mesalib/src/mesa/main/querymatrix.c')
-rw-r--r-- | mesalib/src/mesa/main/querymatrix.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/querymatrix.c b/mesalib/src/mesa/main/querymatrix.c index aee8aef12..19a8e9201 100644 --- a/mesalib/src/mesa/main/querymatrix.c +++ b/mesalib/src/mesa/main/querymatrix.c @@ -38,6 +38,7 @@ #define FLOAT_TO_FIXED(x) ((GLfixed) ((x) * 65536.0)) #if defined(_MSC_VER) +#if _MSC_VER < 1800 /* Not required on VS2013 and above. */ /* Oddly, the fpclassify() function doesn't exist in such a form * on MSVC. This is an implementation using slightly different * lower-level Windows functions. @@ -70,6 +71,7 @@ fpclassify(double x) return FP_NAN; } } +#endif /* _MSC_VER < 1800 */ #elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \ defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \ |