paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-17 17:09:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

* cleanup merge artefacts

Browse Source
This commit is contained in:
florian 2025-01-05 11:06:26 +01:00
parent ac510d391f
commit c8052a3f1d
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compiler/ninl.pas
View File

@ -6074,20 +6074,7 @@ implementation
result:=nil; result:=nil;
end; end;
//
//||||||| .merge-left.r31134
//
//{$ifdef ARM}
// {$i armtype.inc}
//{$endif ARM}
//=======
//
//{$ifdef x86}
// {$i x86type.inc}
//{$endif x86}
//{$ifdef ARM}
// {$i armtype.inc}
//{$endif ARM}
{$if not defined(cpu64bitalu) and not defined(cpuhighleveltarget)} {$if not defined(cpu64bitalu) and not defined(cpuhighleveltarget)}
function tinlinenode.first_ShiftRot_assign_64bitint: tnode; function tinlinenode.first_ShiftRot_assign_64bitint: tnode;
var var