Delphi/pascalscript
Delphi/pascalscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Kylix compilation errors

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/uPSCompiler.pas
View File

@ -6774,7 +6774,11 @@ function TPSPascalCompiler.ProcessSub(BlockInfo: TPSBlockInfo): Boolean;
u := rr.aType; u := rr.aType;
end; end;
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 begin
x.Free; x.Free;

8
Source/uPSR_dll.pas
View File

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

6
Source/uPSRuntime.pas
View File

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