diff --git a/rtl/inc/system.inc b/rtl/inc/system.inc index 46752b27de..8f64474bc3 100644 --- a/rtl/inc/system.inc +++ b/rtl/inc/system.inc @@ -849,7 +849,7 @@ type end; TInitFinalTable = record TableCount, - InitCount : {$ifdef VER2_6}longint{$else}nativeint{$endif}; + InitCount : {$ifdef VER2_6}longint{$else}sizeint{$endif}; Procs : array[1..maxunits] of TInitFinalRec; end; PInitFinalTable = ^TInitFinalTable; @@ -863,7 +863,7 @@ var procedure fpc_InitializeUnits;[public,alias:'FPC_INITIALIZEUNITS']; compilerproc; var - i : nativeint; + i : ObjpasInt; {$ifdef DEBUG} pt : PInitFinalTable; {$endif} diff --git a/rtl/objpas/objpas.pp b/rtl/objpas/objpas.pp index ae73755949..3e3a1e41c1 100644 --- a/rtl/objpas/objpas.pp +++ b/rtl/objpas/objpas.pp @@ -303,7 +303,7 @@ Type end; TResourceStringTableList = Packed Record - Count : nativeint; + Count : sizeint; Tables : Array[{$ifdef cpu16}Byte{$else cpu16}Word{$endif cpu16}] of record TableStart, TableEnd : PResourceStringRecord; @@ -319,7 +319,7 @@ Type end; TResStrInitTable = packed record - Count: {$ifdef VER2_6}longint{$else}nativeint{$endif}; + Count: {$ifdef VER2_6}longint{$else}sizeint{$endif}; Tables: packed array[1..{$ifdef cpu16}8191{$else cpu16}32767{$endif cpu16}] of PResStrInitEntry; end; diff --git a/rtl/win/syswin.inc b/rtl/win/syswin.inc index 2932fa4f86..b41ff3aa75 100644 --- a/rtl/win/syswin.inc +++ b/rtl/win/syswin.inc @@ -648,7 +648,7 @@ type PWStrInitTablesTable = ^TWStrInitTablesTable; TWStrInitTablesTable = packed record - count : {$ifdef VER2_6}longint{$else}nativeint{$endif}; + count : {$ifdef VER2_6}longint{$else}sizeint{$endif}; tables : packed array [1..32767] of PWStrInitEntry; end;