* Remove duplicate ibextraheader handling.

* Move SymAnsiStr boolean setting inside parseextraheader function.
  * Only accept same CurrentPPULongVersion in parseextraheader function.

git-svn-id: trunk@43672 -
This commit is contained in:
pierre 2019-12-11 17:14:27 +00:00
parent f62fd437b1
commit 8c2aa32683

View File

@ -4709,15 +4709,6 @@ begin
b:=readentry;
case b of
ibextraheader:
begin
CurUnit.LongVersion:=cardinal(getlongint);
Writeln(['LongVersion: ',CurUnit.LongVersion]);
getset(tppuset4(CurUnit.ModuleFlags));
if mf_symansistr in CurUnit.ModuleFlags then
SymAnsiStr:=true;
end;
ibmodulename :
begin
CurUnit.Name:=getstring;
@ -4908,7 +4899,9 @@ begin
CurUnit.LongVersion:=cardinal(ppufile.getlongint);
Writeln(['LongVersion: ',CurUnit.LongVersion]);
ppufile.getset(tppuset4(CurUnit.ModuleFlags));
result:=ppufile.EndOfEntry;
result:=ppufile.EndOfEntry and (CurUnit.LongVersion=CurrentPPULongVersion);
if mf_symansistr in CurUnit.ModuleFlags then
SymAnsiStr:=true;
end;
procedure dofile (filename : string);