From 653ddaab2636764b9e7999fa39b37edde7fe7c6d Mon Sep 17 00:00:00 2001 From: Aras Pranckevicius Date: Wed, 25 Aug 2010 10:07:14 +0300 Subject: [PATCH] glsl/mesa: fixes for MSVC Signed-off-by: Brian Paul --- src/glsl/glcpp/pp.c | 1 + src/mesa/main/imports.h | 1 + 2 files changed, 2 insertions(+) diff --git a/src/glsl/glcpp/pp.c b/src/glsl/glcpp/pp.c index 7672490958d..8769f4f7e55 100644 --- a/src/glsl/glcpp/pp.c +++ b/src/glsl/glcpp/pp.c @@ -25,6 +25,7 @@ #include #include #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 cb35885dbd9..317e2b7df02 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 /*@}*/ -- 2.30.2