Преглед изворни кода

* tdynarraytypeinfo moved to interface
* made aligntoptr inlined

git-svn-id: trunk@630 -

florian пре 20 година
родитељ
комит
8dd52941d5
2 измењених фајлова са 13 додато и 12 уклоњено
  1. 1 9
      rtl/inc/dynarr.inc
  2. 12 3
      rtl/inc/dynarrh.inc

+ 1 - 9
rtl/inc/dynarr.inc

@@ -24,16 +24,8 @@ type
       high : tdynarrayindex;
       high : tdynarrayindex;
    end;
    end;
 
 
-   pdynarraytypeinfo = ^tdynarraytypeinfo;
-   tdynarraytypeinfo = packed record
-      kind : byte;
-      namelen : byte;
-      { here the chars follow, we've to skip them }
-      elesize : sizeint;
-      eletype : pdynarraytypeinfo;
-   end;
 
 
-function aligntoptr(p : pointer) : pointer;
+function aligntoptr(p : pointer) : pointer;inline;
   begin
   begin
 {$ifdef FPC_REQUIRES_PROPER_ALIGNMENT}
 {$ifdef FPC_REQUIRES_PROPER_ALIGNMENT}
     if (ptrint(p) mod sizeof(ptrint))<>0 then
     if (ptrint(p) mod sizeof(ptrint))<>0 then

+ 12 - 3
rtl/inc/dynarrh.inc

@@ -1,6 +1,6 @@
 {
 {
     This file is part of the Free Pascal Run time library.
     This file is part of the Free Pascal Run time library.
-    Copyright (c) 1999-2000 by the Free Pascal development team
+    Copyright (c) 1999-2005 by the Free Pascal development team
 
 
     This file contains type declarations necessary for the dynamic
     This file contains type declarations necessary for the dynamic
     array routine helpers in syshelp.inc
     array routine helpers in syshelp.inc
@@ -16,6 +16,15 @@
 **********************************************************************}
 **********************************************************************}
 
 
 type
 type
-   tdynarrayindex = sizeint;
-   pdynarrayindex = ^tdynarrayindex;
+  tdynarrayindex = sizeint;
+  pdynarrayindex = ^tdynarrayindex;
 
 
+  pdynarraytypeinfo = ^tdynarraytypeinfo;
+  tdynarraytypeinfo = packed record
+    kind : byte;
+    namelen : byte;
+    { here the chars follow, we've to skip them }
+    elesize : sizeint;
+    eletype : pdynarraytypeinfo;
+    vartype : longint;
+  end;