* fixed compilation of unit classes with integer=smallint

git-svn-id: trunk@27045 -

rtl/objpas/classes/classesh.inc

@@ -854,8 +854,8 @@ type
     procedure WriteComponentRes(const ResName: string; Instance: TComponent);
     procedure WriteDescendent(Instance, Ancestor: TComponent);
     procedure WriteDescendentRes(const ResName: string; Instance, Ancestor: TComponent);
-    procedure WriteResourceHeader(const ResName: string; {!!!:out} var FixupInfo: Integer);
-    procedure FixupResourceHeader(FixupInfo: Integer);
+    procedure WriteResourceHeader(const ResName: string; {!!!:out} var FixupInfo: Longint);
+    procedure FixupResourceHeader(FixupInfo: Longint);
     procedure ReadResHeader;
     function ReadByte : Byte;
     function ReadWord : Word;
@@ -881,7 +881,7 @@ type
     function Read(var Buffer; Count: Longint): Longint; override;
     function Write(const Buffer; Count: Longint): Longint; override;
     function Seek(const Offset: int64; Origin: TSeekOrigin): int64; override;
-    procedure Check(err:longint); virtual;
+    procedure Check(err:integer); virtual;
   end;
 
   { TOwnerStream }

rtl/objpas/classes/compon.inc

@@ -661,7 +661,7 @@ begin
     Result := E_NOINTERFACE;
 end;
 
-function TComponent._AddRef: Integer;{$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
+function TComponent._AddRef: Longint;{$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
 begin
   if Assigned(VCLComObject) then
     Result := IVCLComObject(VCLComObject)._AddRef
@@ -669,7 +669,7 @@ begin
     Result := -1;
 end;
 
-function TComponent._Release: Integer;{$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
+function TComponent._Release: Longint;{$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
 begin
   if Assigned(VCLComObject) then
     Result := IVCLComObject(VCLComObject)._Release

rtl/objpas/classes/persist.inc

@@ -142,7 +142,7 @@ begin
 end;
 
 
-function TInterfacedPersistent._AddRef: Integer;{$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
+function TInterfacedPersistent._AddRef: Longint;{$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
 begin
   if assigned(FOwnerInterface) then
     Result:=FOwnerInterface._AddRef
@@ -151,7 +151,7 @@ begin
 end;
 
 
-function TInterfacedPersistent._Release: Integer;{$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
+function TInterfacedPersistent._Release: Longint;{$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
 begin
   if assigned(FOwnerInterface) then
     Result:=FOwnerInterface._Release

rtl/objpas/classes/reader.inc

@@ -289,7 +289,9 @@ end;
 
 function TBinaryObjectReader.ReadSet(EnumType: Pointer): Integer;
 type
-  tset = set of 0..31;
+{$packset 1}
+  tset = set of 0..(SizeOf(Integer)*8-1);
+{$packset default}
 var
   Name: String;
   Value: Integer;

rtl/objpas/classes/streams.inc

@@ -306,7 +306,7 @@ end;
   procedure TStream.WriteDescendentRes(const ResName: string; Instance, Ancestor: TComponent);
 
     var
-      FixupInfo: Integer;
+      FixupInfo: Longint;
 
     begin
 
@@ -319,7 +319,7 @@ end;
 
     end;
 
-  procedure TStream.WriteResourceHeader(const ResName: string; {!!!: out} var FixupInfo: Integer);
+  procedure TStream.WriteResourceHeader(const ResName: string; {!!!: out} var FixupInfo: Longint);
     var
       ResType, Flags : word;
     begin
@@ -342,10 +342,10 @@ end;
        FixupInfo := Position;
     end;
 
-  procedure TStream.FixupResourceHeader(FixupInfo: Integer);
+  procedure TStream.FixupResourceHeader(FixupInfo: Longint);
 
     var
-       ResSize,TmpResSize : Integer;
+       ResSize,TmpResSize : Longint;
 
     begin
 

rtl/objpas/classes/writer.inc

@@ -132,7 +132,7 @@ begin
   { Only write the flags if they are needed! }
   if Flags <> [] then
   begin
-    Prefix := Integer(Flags) or $f0;
+    Prefix := Longint(Flags) or $f0;
     Write(Prefix, 1);
     if ffChildPos in Flags then
       WriteInteger(ChildPos);