diff options
| author | Iain Merrick <husky@google.com> | 2010-09-13 16:35:48 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-09-16 12:10:42 +0100 |
| commit | 5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306 (patch) | |
| tree | ddce1aa5e3b6967a69691892e500897558ff8ab6 /ANGLE/src/compiler/preprocessor/tokens.c | |
| parent | 12bec63ec71e46baba27f0bd9bd9d8067683690a (diff) | |
| download | external_webkit-5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306.zip external_webkit-5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306.tar.gz external_webkit-5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306.tar.bz2 | |
Merge WebKit at r67178 : Initial merge by git.
Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
Diffstat (limited to 'ANGLE/src/compiler/preprocessor/tokens.c')
| -rw-r--r-- | ANGLE/src/compiler/preprocessor/tokens.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/ANGLE/src/compiler/preprocessor/tokens.c b/ANGLE/src/compiler/preprocessor/tokens.c index 7cfc73d..057cce8 100644 --- a/ANGLE/src/compiler/preprocessor/tokens.c +++ b/ANGLE/src/compiler/preprocessor/tokens.c @@ -1,8 +1,3 @@ -// -// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -// /****************************************************************************\ Copyright (c) 2002, NVIDIA Corporation. @@ -210,7 +205,7 @@ void DeleteTokenStream(TokenStream *pTok) void RecordToken(TokenStream *pTok, int token, yystypepp * yylvalpp) { const char *s; - unsigned char *str=NULL; + char *str=NULL; if (token > 256) lAddByte(pTok, (unsigned char)((token & 0x7f) + 0x80)); |