From: Morgan Armand Date: Sat, 29 Oct 2011 17:37:58 +0000 (-0700) Subject: glsl: Fix compilation of glsl_lexer.ll with MSVC. X-Git-Tag: 062012170305~3577 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=439d67f502cf78a977501c310e13d8d5f05e4986;p=profile%2Fivi%2Fmesa.git glsl: Fix compilation of glsl_lexer.ll with MSVC. strtoull is not supported on msvc (as there is no C99 support). --- 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;