From b4a7d21b9e65f069c628dad56b407dddefda8403 Mon Sep 17 00:00:00 2001 From: Fyren Date: Tue, 24 May 2011 10:49:40 -0400 Subject: [PATCH] Removed compiler double include check (bug 4863, r=dvander). --- sourcepawn/compiler/sc2.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/sourcepawn/compiler/sc2.c b/sourcepawn/compiler/sc2.c index 470743af..c792ed4d 100644 --- a/sourcepawn/compiler/sc2.c +++ b/sourcepawn/compiler/sc2.c @@ -269,27 +269,9 @@ static void doinclude(int silent) if (c!='\0') check_empty(lptr+1); /* verify that the rest of the line is whitespace */ - /* create a symbol from the name of the include file; this allows the system - * to test for multiple inclusions - */ - strcpy(symname,"_inc_"); - if ((ptr=strrchr(name,DIRSEP_CHAR))!=NULL) - strlcat(symname,ptr+1,sizeof symname); - else - strlcat(symname,name,sizeof symname); - if (find_symbol(&glbtab,symname,fcurrent,-1,NULL)==NULL) { - /* constant is not present, so this file has not been included yet */ - - /* Include files between "..." or without quotes are read from the current - * directory, or from a list of "include directories". Include files - * between <...> are only read from the list of include directories. - */ - result=plungefile(name,(c!='>'),TRUE); - if (result) - add_constant(symname,1,sGLOBAL,0); - else if (!silent) - error(120,name); /* cannot read from ... (fatal error) */ - } /* if */ + result=plungefile(name,(c!='>'),TRUE); + if (!result && !silent) + error(120,name); /* cannot read from ... (fatal error) */ } /* readline