Fix Kylix compilation errors

This commit is contained in:
Gregor A. Cieslak 2013-05-28 07:17:59 +02:00
parent be06654c13
commit 85e8d5032b
3 changed files with 12 additions and 8 deletions

View File

@ -6774,7 +6774,11 @@ function TPSPascalCompiler.ProcessSub(BlockInfo: TPSBlockInfo): Boolean;
u := rr.aType;
end;
end
{$IFDEF PS_HAVEVARIANT}else if (u.BaseType = btVariant) then break else {$ENDIF}
{$IFDEF PS_HAVEVARIANT}
else if (u.BaseType = btVariant) then break else
{$ELSE}
;
{$ENDIF}
begin
x.Free;

View File

@ -18,7 +18,7 @@ uses
{$IFDEF UNIX}
Unix, baseunix, dynlibs, termio, sockets;
{$ELSE}
Windows;
{$IFDEF KYLIX}SysUtils;{$ELSE}Windows;{$ENDIF}
{$ENDIF}
{
@ -105,8 +105,8 @@ begin
Result := False;
exit;
end;
{$IFDEF UNIX}
dllhandle := LoadLibrary(PChar(s2));
{$if defined(UNIX) or defined(KYLIX)}
dllhandle := LoadLibrary(PChar(s2));
{$ELSE}
{$IFDEF UNICODE}
if Copy(s2, 1, 6) = '<utf8>' then
@ -120,7 +120,7 @@ begin
dllhandle := LoadLibraryEx(PChar(Filename), 0, LOAD_WITH_ALTERED_SEARCH_PATH)
else
dllhandle := LoadLibrary(PChar(Filename));
{$ENDIF}
{$ifend}
if dllhandle = 0 then
begin
p.Ext2 := Pointer(1);

View File

@ -1101,7 +1101,7 @@ function IDispatchInvoke(Self: IDispatch; PropertySet: Boolean; const Name: tbtS
implementation
uses
TypInfo {$IFDEF DELPHI3UP}{$IFNDEF FPC} , ComObj {$ENDIF}{$ENDIF};
TypInfo {$IFDEF DELPHI3UP}{$IFNDEF FPC}{$IFNDEF KYLIX} , ComObj {$ENDIF}{$ENDIF}{$ENDIF};
{$IFDEF DELPHI3UP }
resourceString
@ -4224,7 +4224,7 @@ end;
{$IFDEF FPC}
{$if defined(FPC) or defined(KYLIX)}
function OleErrorMessage(ErrorCode: HResult): tbtString;
begin
Result := SysErrorMessage(ErrorCode);
@ -4241,7 +4241,7 @@ procedure OleCheck(Result: HResult);
begin
if Result < 0 then OleError(Result);
end;
{$ENDIF}
{$ifend}
{$IFNDEF DELPHI3UP}