Browse Source

+ Removed FPC_ALIGNSRTTI define

git-svn-id: trunk@251 -
michael 20 years ago
parent
commit
7712d4e2d1
2 changed files with 0 additions and 8 deletions
  1. 0 6
      rtl/inc/dynarr.inc
  2. 0 2
      rtl/inc/objpas.inc

+ 0 - 6
rtl/inc/dynarr.inc

@@ -80,9 +80,7 @@ procedure fpc_dynarray_clear_internal(p : pointer;ti : pointer);
      { skip kind and name }
      { skip kind and name }
      inc(pointer(ti),ord(pdynarraytypeinfo(ti)^.namelen)+2);
      inc(pointer(ti),ord(pdynarraytypeinfo(ti)^.namelen)+2);
 
 
-{$ifdef FPC_ALIGNSRTTI}
      ti:=aligntoptr(ti);
      ti:=aligntoptr(ti);
-{$endif FPC_ALIGNSRTTI}
 
 
      elesize:=psizeint(ti)^;
      elesize:=psizeint(ti)^;
      eletype:=pdynarraytypeinfo(pointer(pdynarraytypeinfo(pointer(ti)+sizeof(sizeint)))^);
      eletype:=pdynarraytypeinfo(pointer(pdynarraytypeinfo(pointer(ti)+sizeof(sizeint)))^);
@@ -181,9 +179,7 @@ procedure fpc_dynarray_setlength(var p : pointer;pti : pointer;
      { skip kind and name }
      { skip kind and name }
      inc(pointer(ti),ord(pdynarraytypeinfo(ti)^.namelen)+2);
      inc(pointer(ti),ord(pdynarraytypeinfo(ti)^.namelen)+2);
 
 
-{$ifdef FPC_ALIGNSRTTI}
      ti:=aligntoptr(ti);
      ti:=aligntoptr(ti);
-{$endif FPC_ALIGNSRTTI}
 
 
      elesize:=psizeint(ti)^;
      elesize:=psizeint(ti)^;
      eletype:=pdynarraytypeinfo(pointer(pdynarraytypeinfo(pointer(ti)+sizeof(sizeint)))^);
      eletype:=pdynarraytypeinfo(pointer(pdynarraytypeinfo(pointer(ti)+sizeof(sizeint)))^);
@@ -333,9 +329,7 @@ procedure fpc_dynarray_copy(var pdest : pointer;psrc : pointer;ti : pointer;
      { skip kind and name }
      { skip kind and name }
      inc(pointer(ti),ord(pdynarraytypeinfo(ti)^.namelen)+2);
      inc(pointer(ti),ord(pdynarraytypeinfo(ti)^.namelen)+2);
 
 
-{$ifdef FPC_ALIGNSRTTI}
      ti:=aligntoptr(ti);
      ti:=aligntoptr(ti);
-{$endif FPC_ALIGNSRTTI}
 
 
      elesize:=psizeint(ti)^;
      elesize:=psizeint(ti)^;
      eletype:=pdynarraytypeinfo(pointer(pdynarraytypeinfo(pointer(ti)+sizeof(sizeint)))^);
      eletype:=pdynarraytypeinfo(pointer(pdynarraytypeinfo(pointer(ti)+sizeof(sizeint)))^);

+ 0 - 2
rtl/inc/objpas.inc

@@ -530,9 +530,7 @@
                    inc(Temp);
                    inc(Temp);
                    I:=Temp^;
                    I:=Temp^;
                    inc(temp,I+1);                // skip name string;
                    inc(temp,I+1);                // skip name string;
-{$ifdef FPC_ALIGNSRTTI}
                    temp:=aligntoptr(temp);
                    temp:=aligntoptr(temp);
-{$endif FPC_ALIGNSRTTI}
 {$ifdef FPC_REQUIRES_PROPER_ALIGNMENT}
 {$ifdef FPC_REQUIRES_PROPER_ALIGNMENT}
                    move(PRecRec(Temp)^.Count,Count,sizeof(Count));
                    move(PRecRec(Temp)^.Count,Count,sizeof(Count));
 {$else FPC_REQUIRES_PROPER_ALIGNMENT}
 {$else FPC_REQUIRES_PROPER_ALIGNMENT}