paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-17 18:09:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed compilation of unit classes with integer=smallint

Browse Source 
git-svn-id: trunk@27045 -
This commit is contained in:
nickysn 2014-03-09 14:21:32 +00:00
parent ca451988a8
commit 9418fa9b8b
6 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtl/objpas/classes/classesh.inc
View File

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

4
rtl/objpas/classes/compon.inc
View File

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

4
rtl/objpas/classes/persist.inc
View File

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

4
rtl/objpas/classes/reader.inc
View File

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

8
rtl/objpas/classes/streams.inc
View File

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

2
rtl/objpas/classes/writer.inc
View File

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