Commit c7b6eba9 by alokp@chromium.org

Fixed warnings about deprecated conversion from string constant to char*. Submitted by timeless.

BUG=18 Review URL: http://codereview.appspot.com/1936041 git-svn-id: https://angleproject.googlecode.com/svn/trunk@381 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent b416e70e
...@@ -318,7 +318,7 @@ int PaParseStrings(char* argv[], int strLen[], int argc, TParseContext& parseCon ...@@ -318,7 +318,7 @@ int PaParseStrings(char* argv[], int strLen[], int argc, TParseContext& parseCon
return 0; return 0;
} }
void yyerror(char *s) void yyerror(const char *s)
{ {
if (((TParseContext *)cpp->pC)->AfterEOF) { if (((TParseContext *)cpp->pC)->AfterEOF) {
if (cpp->tokensBeforeEOF == 1) { if (cpp->tokensBeforeEOF == 1) {
......
...@@ -38,7 +38,7 @@ compiler/tools. Remove it when we can exclusively use the newer version. ...@@ -38,7 +38,7 @@ compiler/tools. Remove it when we can exclusively use the newer version.
#define parseContext ((TParseContext*)(parseContextLocal)) #define parseContext ((TParseContext*)(parseContextLocal))
#define YYLEX_PARAM parseContextLocal #define YYLEX_PARAM parseContextLocal
#define YY_DECL int yylex(YYSTYPE* pyylval, void* parseContextLocal) #define YY_DECL int yylex(YYSTYPE* pyylval, void* parseContextLocal)
extern void yyerror(char*); extern void yyerror(const char*);
#define FRAG_VERT_ONLY(S, L) { \ #define FRAG_VERT_ONLY(S, L) { \
if (parseContext->language != EShLangFragment && \ if (parseContext->language != EShLangFragment && \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment