Browse Source

AROS: Remove CPU64 ifdef's ensuring 64-bit compatibility for records/fields

Preparation for the introduction of stack aligned records fields (AROS STACKED
structure members).

Remove unmaintainable superfluous ifdef's that are used inside certain record
structures (in an attempt to use correct padding on 64-bit targets) because
they are not in line with the introduction of stack aligned record fields.
magorium 3 years ago
parent
commit
aa8fe28a05
2 changed files with 0 additions and 54 deletions
  1. 0 39
      packages/arosunits/src/datatypes.pas
  2. 0 15
      packages/arosunits/src/mui.pas

+ 0 - 39
packages/arosunits/src/datatypes.pas

@@ -373,9 +373,6 @@ type
     dtf_ContentsInfo: PFrameInfo;
     dtf_FrameInfo: PFrameInfo;    // Input
     dtf_SizeFrameInfo: LongWord;  // Output
-    {$ifdef CPU64}
-    pad: LongWord;
-    {$endif}
     dtf_FrameFlags: LongWord;
   end;
 
@@ -443,29 +440,11 @@ type
     MethodID: PtrUInt;
     dtd_RPort: PRastPort;
     dtd_Left: LongInt;
-    {$ifdef CPU64}
-    pad1: LongWord;
-    {$endif}
     dtd_Top: LongInt;
-    {$ifdef CPU64}
-    pad2: LongWord;
-    {$endif}
     dtd_Width: LongInt;
-    {$ifdef CPU64}
-    pad3: LongWord;
-    {$endif}
     dtd_Height: LongInt;
-    {$ifdef CPU64}
-    pad4: LongWord;
-    {$endif}
     dtd_TopHoriz: LongInt;
-    {$ifdef CPU64}
-    pad5: LongWord;
-    {$endif}
     dtd_TopVert: LongInt;
-    {$ifdef CPU64}
-    pad6: LongWord;
-    {$endif}
     dtd_AttrList: PTagItem; // Additional attributes
   end;
 
@@ -833,28 +812,13 @@ type
   TadtFrame = record
     MethodID: PtrUInt;
     alf_TimeStamp: LongWord;
-    {$ifdef CPU64}
-    pad1: LongWord;
-    {$endif}
     alf_Frame: LongWord;
-    {$ifdef CPU64}
-    pad2: LongWord;
-    {$endif}
     alf_Duration: LongWord;
-    {$ifdef CPU64}
-    pad3: LongWord;
-    {$endif}
     alf_BitMap: PBitMap;
     alf_CMap: PColorMap;
     alf_Sample: PShortInt;
     alf_SampleLength: LongWord;
-    {$ifdef CPU64}
-    pad4: LongWord;
-    {$endif}
     alf_Period: LongWord;
-    {$ifdef CPU64}
-    pad5: LongWord;
-    {$endif}
     alf_UserData: APTR;
   end;
 
@@ -880,9 +844,6 @@ type
   TadtStart = record
     MethodID: PtrUInt;
     asa_Frame: LongWord;
-    {$ifdef CPU64}
-    pad1: LongWord;
-    {$endif}
   end;
 
 function SDTM_ISSTEREO(SampleType: LongWord): Boolean; inline;

+ 0 - 15
packages/arosunits/src/mui.pas

@@ -1870,26 +1870,11 @@ type
     lm_Type: PtrUInt;      // type of message (see defines below)
     lm_Children: PMinList;  // list of this groups children, traverse with NextObject()
     lm_MinMax: TMUI_MinMax; // results for MUILM_MINMAX
-    {$ifdef CPU64}
-    pad1: LongWord;
-    {$endif}
     lm_Layout: record       // size (and result) for MUILM_LAYOUT
        Width: LongInt;
-       {$ifdef CPU64}
-       pad2: LongWord;
-       {$endif}
        Height: LongInt;
-       {$ifdef CPU64}
-       pad3: LongWord;
-       {$endif}
        priv5: LongWord;
-       {$ifdef CPU64}
-       pad4: LongWord;
-       {$endif}
        priv6: LongWord;
-       {$ifdef CPU64}
-       pad5: LongWord;
-       {$endif}
     end;
   end;
   PMUI_LayoutMsg = ^TMUI_LayoutMsg;