mesa compile fixes for VS2013

src/mesa/main/querymatrix.c

 /**************************************************************************
  *
  * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
  * All Rights Reserved.
  *
  **************************************************************************/
 
 
 /**
  * Code to implement GL_OES_query_matrix.  See the spec at:
@@ skipping 19 matching lines @@
  *  word which is zero if all the components are valid. If
  *  status & (1<<i) != 0, the component i is invalid (e.g., NaN, Inf).
  *  The implementations are not required to keep track of overflows.  In
  *  that case, the invalid bits are never set.
  */
 
 #define INT_TO_FIXED(x) ((GLfixed) ((x) << 16))
 #define FLOAT_TO_FIXED(x) ((GLfixed) ((x) * 65536.0))
 
 #if defined(_MSC_VER)
+#if _MSC_VER < 1800  // Not required on VS2013 and above.

[marcheu, 2013/10/21 23:20:18]

Please use C-style /* ... */ comments, there are other platforms which could
expect those.

[scottmg, 2013/10/21 23:23:24]

Done.

 /* Oddly, the fpclassify() function doesn't exist in such a form
  * on MSVC.  This is an implementation using slightly different
  * lower-level Windows functions.
  */
 #include <float.h>
 
 enum {FP_NAN, FP_INFINITE, FP_ZERO, FP_SUBNORMAL, FP_NORMAL}
 fpclassify(double x)
 {
     switch(_fpclass(x)) {
@@ skipping 12 matching lines @@
         case _FPCLASS_NZ:   /* negative zero */
         case _FPCLASS_PZ:   /* positive zero */
             return FP_ZERO;
         default:
             /* Should never get here; but if we do, this will guarantee
              * that the pattern is not treated like a number.
              */
             return FP_NAN;
     }
 }
+#endif  // _MSC_VER < 1800
 
 #elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \
      defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \
      (defined(__sun) && defined(__C99FEATURES__)) || defined(__MINGW32__) || \
      (defined(__sun) && defined(__GNUC__)) || defined(ANDROID) || defined(__HAIKU__)
 
 /* fpclassify is available. */
 
 #elif !defined(_XOPEN_SOURCE) || _XOPEN_SOURCE < 600
 
@@ skipping 121 matching lines @@
                 exponent[i] = (GLint) 0;
                 rv |= bit;
                 break;
         }
 
     } /* for each component */
 
     /* All done */
     return rv;
 }