From 5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306 Mon Sep 17 00:00:00 2001 From: Iain Merrick Date: Mon, 13 Sep 2010 16:35:48 +0100 Subject: Merge WebKit at r67178 : Initial merge by git. Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18 --- ANGLE/src/compiler/preprocessor/tokens.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'ANGLE/src/compiler/preprocessor/tokens.c') 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)); -- cgit v1.1