Przeglądaj źródła

* reverted r32746: *inttype shall be the normally used integer type, os*inttype shall be the int type with the max. size of integer registers

git-svn-id: trunk@32789 -
florian 9 lat temu
rodzic
commit
53e89b25d1
2 zmienionych plików z 5 dodań i 5 usunięć
  1. 4 4
      compiler/psystem.pas
  2. 1 1
      compiler/symdef.pas

+ 4 - 4
compiler/psystem.pas

@@ -113,14 +113,14 @@ implementation
     procedure set_default_int_types;
       begin
 {$ifdef cpu64bitaddr}
+        uinttype:=u64inttype;
+        sinttype:=s64inttype;
         ptruinttype:=u64inttype;
         ptrsinttype:=s64inttype;
 {$endif cpu64bitaddr}
-{$ifdef cpu64bitalu}
-        uinttype:=u64inttype;
-        sinttype:=s64inttype;
-{$endif cpu64bitalu}
 {$ifdef cpu32bitaddr}
+        uinttype:=u32inttype;
+        sinttype:=s32inttype;
         ptruinttype:=u32inttype;
         ptrsinttype:=s32inttype;
 {$endif cpu32bitaddr}

+ 1 - 1
compiler/symdef.pas

@@ -1059,7 +1059,7 @@ interface
        { we use only one variant def for every variant class }
        cvarianttype,
        colevarianttype,
-       { default integer type s32inttype on 32 bit systems, s64bittype on 64 bit systems }
+       { default integer type, normally s32inttype on 32 bit systems and s64bittype on 64 bit systems }
        sinttype,
        uinttype,
        { integer types corresponding to OS_SINT/OS_INT }