Module: Mesa Branch: master Commit: 439d67f502cf78a977501c310e13d8d5f05e4986 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=439d67f502cf78a977501c310e13d8d5f05e4986
Author: Morgan Armand <[email protected]> Date: Sat Oct 29 10:37:58 2011 -0700 glsl: Fix compilation of glsl_lexer.ll with MSVC. strtoull is not supported on msvc (as there is no C99 support). --- src/glsl/glsl_lexer.ll | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll index e444536..5364841 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; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
