UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed compiler double include check (bug 4863, r=dvander).

Browse Source
This commit is contained in:
Fyren 2011-05-24 10:49:40 -04:00
parent d03e051611
commit b4a7d21b9e
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sourcepawn/compiler/sc2.c
View File

@ -269,27 +269,9 @@ static void doinclude(int silent)
if (c!='\0') if (c!='\0')
check_empty(lptr+1); /* verify that the rest of the line is whitespace */ 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 result=plungefile(name,(c!='>'),TRUE);
* to test for multiple inclusions if (!result && !silent)
*/ error(120,name); /* cannot read from ... (fatal error) */
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 */
} }
/* readline /* readline