glsl/mesa: fixes for MSVC

Signed-off-by: Brian Paul <brianp@vmware.com>

diff --git a/src/glsl/glcpp/pp.c b/src/glsl/glcpp/pp.c
index 7672490958de6204da09ea50989dcdfe78cc8edb..8769f4f7e55a1de926faa939139851962b435139 100644 (file)
--- a/src/glsl/glcpp/pp.c
+++ b/src/glsl/glcpp/pp.c
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <ctype.h>
 #include "glcpp.h"
+#include "main/core.h" /* for isblank() on MSVC */
 
 void
 glcpp_error (YYLTYPE *locp, glcpp_parser_t *parser, const char *fmt, ...)

diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index cb35885dbd937e32519f9220c2bf966b8f602e8d..317e2b7df0264d8722d3cff30bd6d2cb2118d0cd 100644 (file)
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -148,6 +148,7 @@ static INLINE float truncf(float x) { return x < 0.0f ? ceilf(x) : floorf(x); }
 static INLINE float exp2f(float x) { return powf(2.0f, x); }
 static INLINE float log2f(float x) { return logf(x) * 1.442695041f; }
 static INLINE int isblank(int ch) { return ch == ' ' || ch == '\t'; }
+#define strtoll(p, e, b) _strtoi64(p, e, b)
 #endif
 /*@}*/