浏览代码

* TRttiDataCommon is required outside of the RTTI and DynArray include files as well

git-svn-id: trunk@42437 -
svenbarth 6 年之前
父节点
当前提交
55dfb59631
共有 1 个文件被更改,包括 12 次插入13 次删除
  1. 12 13
      rtl/inc/system.inc

+ 12 - 13
rtl/inc/system.inc

@@ -458,6 +458,18 @@ function aligntoqword(p : pointer) : pointer;inline;
   end;
 
 
+{$if not defined(VER3_0) and not defined(VER3_2)}
+type
+  TRttiDataCommon =
+{$ifdef FPC_REQUIRES_PROPER_ALIGNMENT}
+  packed
+{$endif}
+  record
+    Attrs: Pointer;
+  end;
+{$endif not VER3_0 and not VER3_2}
+
+
 {****************************************************************************
                   Subroutines for String handling
 ****************************************************************************}
@@ -488,19 +500,6 @@ function aligntoqword(p : pointer) : pointer;inline;
                   Run-Time Type Information (RTTI) declarations
 ****************************************************************************}
 
-{$if defined(FPC_HAS_FEATURE_RTTI) or defined(FPC_HAS_FEATURE_DYNARRAYS)}
-{$if not defined(VER3_0) and not defined(VER3_2)}
-type
-  TRttiDataCommon =
-{$ifdef FPC_REQUIRES_PROPER_ALIGNMENT}
-  packed
-{$endif}
-  record
-    Attrs: Pointer;
-  end;
-{$endif not VER3_0 and not VER3_2}
-{$endif FPC_HAS_FEATURE_RTTI or FPC_HAS_FEATURE_DYNARRAYS}
-
 {$ifdef FPC_HAS_FEATURE_RTTI}
 {$i rttidecl.inc}
 {$endif FPC_HAS_FEATURE_RTTI}