summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMorgan Armand <morgan.devel@gmail.com>2011-10-29 10:37:58 -0700
committerKenneth Graunke <kenneth@whitecape.org>2011-10-29 10:37:58 -0700
commit439d67f502cf78a977501c310e13d8d5f05e4986 (patch)
treee670d761452b30dfca19a8eca8cb1b00cfaad400
parente8139ebf583acf37150a8b341bcbef6b924a7792 (diff)
glsl: Fix compilation of glsl_lexer.ll with MSVC.
strtoull is not supported on msvc (as there is no C99 support).
-rw-r--r--src/glsl/glsl_lexer.ll4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll
index e444536f5a2..5364841ecd3 100644
--- a/src/glsl/glsl_lexer.ll
+++ b/src/glsl/glsl_lexer.ll
@@ -93,7 +93,11 @@ literal_integer(char *text, int len, struct _mesa_glsl_parse_state *state,
if (base == 16)
digits += 2;
+#ifdef _MSC_VER
+ unsigned __int64 value = _strtoui64(digits, NULL, base);
+#else
unsigned long long value = strtoull(digits, NULL, base);
+#endif
lval->n = (int)value;