projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e8139eb
)
glsl: Fix compilation of glsl_lexer.ll with MSVC.
author
Morgan Armand
<morgan.devel@gmail.com>
Sat, 29 Oct 2011 17:37:58 +0000
(10:37 -0700)
committer
Kenneth Graunke
<kenneth@whitecape.org>
Sat, 29 Oct 2011 17:37:58 +0000
(10:37 -0700)
strtoull is not supported on msvc (as there is no C99 support).
src/glsl/glsl_lexer.ll
patch
|
blob
|
history
diff --git
a/src/glsl/glsl_lexer.ll
b/src/glsl/glsl_lexer.ll
index e444536f5a2af5659465e203bdf5d0bef5299c43..5364841ecd335e3009f1bcadd12b53de3e02782e 100644
(file)
--- 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;