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

* fixed compilation of unit variants with integer=smallint

Browse Source 
git-svn-id: trunk@27046 -
This commit is contained in:
nickysn 2014-03-09 14:44:45 +00:00
parent 9418fa9b8b
commit b5f1445f90
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/rtl-objpas/src/inc/variants.pp
View File

@ -163,8 +163,8 @@ type
FVarType: TVarType; FVarType: TVarType;
protected protected
function QueryInterface({$IFDEF FPC_HAS_CONSTREF}constref{$ELSE}const{$ENDIF} IID: TGUID; out Obj): HResult; virtual; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; function QueryInterface({$IFDEF FPC_HAS_CONSTREF}constref{$ELSE}const{$ENDIF} IID: TGUID; out Obj): HResult; virtual; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
function _AddRef: Integer; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; function _AddRef: Longint; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
function _Release: Integer; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; function _Release: Longint; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
procedure SimplisticClear(var V: TVarData); procedure SimplisticClear(var V: TVarData);
procedure SimplisticCopy(var Dest: TVarData; const Source: TVarData; const Indirect: Boolean = False); procedure SimplisticCopy(var Dest: TVarData; const Source: TVarData; const Indirect: Boolean = False);
procedure RaiseInvalidOp; procedure RaiseInvalidOp;
@ -603,7 +603,7 @@ begin
end; end;
function Sysvartoint (const v : Variant) : Integer; function Sysvartoint (const v : Variant) : Longint;
begin begin
if VarType(v) = varNull then if VarType(v) = varNull then
if NullStrictConvert then if NullStrictConvert then
@ -2192,7 +2192,7 @@ var
Iterator : TVariantArrayIterator; Iterator : TVariantArrayIterator;
Dims : Integer; Dims : Integer;
HighBound : Integer; HighBound : Longint;
i : Integer; i : Integer;
begin begin
with aSource do begin with aSource do begin
@ -3662,13 +3662,13 @@ function TCustomVariantType.QueryInterface({$IFDEF FPC_HAS_CONSTREF}constref{$EL
end; end;
function TCustomVariantType._AddRef: Integer; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; function TCustomVariantType._AddRef: Longint; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
begin begin
result := -1; result := -1;
end; end;
function TCustomVariantType._Release: Integer; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; function TCustomVariantType._Release: Longint; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
begin begin
result := -1; result := -1;
end; end;