Mesa (master): glsl/mesa: fixes for MSVC

[Brian Paul]

Module: Mesa
Branch: master
Commit: 653ddaab2636764b9e7999fa39b37edde7fe7c6d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=653ddaab2636764b9e7999fa39b37edde7fe7c6d

Author: Aras Pranckevicius <aras at unity3d.com>
Date:   Wed Aug 25 10:07:14 2010 +0300

glsl/mesa: fixes for MSVC

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

---

 src/glsl/glcpp/pp.c     |    1 +
 src/mesa/main/imports.h |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/glsl/glcpp/pp.c b/src/glsl/glcpp/pp.c
index 7672490..8769f4f 100644
--- 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 cb35885..317e2b7 100644
--- 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
 /*@}*/