paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-23 09:19:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fixing VER1_1 compile problem to allow using 1.1 compiler

Browse Source 
* Most of oldlinux unit calls are now in BaseUnix unit with prefix Fp

git-svn-id: trunk@4748 -
This commit is contained in:
mazen 2003-10-31 14:25:59 +00:00
parent 948299f460
commit 0a465d4795
7 changed files with 52 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/codetools/fileprocs.pas
View File

@ -75,7 +75,7 @@ implementation
// to get more detailed error messages consider the os
{$IFNDEF win32}
uses
{$IFDEF Ver1_0} Linux {$ELSE} Unix {$ENDIF};
{$IFDEF Ver1_0} Linux {$ELSE} Unix,BaseUnix {$ENDIF};
{$ENDIF}
var
@ -134,8 +134,8 @@ begin
raise Exception.CreateFmt(ctsFileDoesNotExists,[AFilename]);
end;
{$IFNDEF win32}
if not{$IFDEF Ver1_0}Linux{$ELSE}Unix{$ENDIF}.Access(
AFilename,{$IFDEF Ver1_0}Linux{$ELSE}Unix{$ENDIF}.X_OK) then
if not{$IFDEF Ver1_0}Linux.Access{$ELSE}BaseUnix.FpAccess{$ENDIF}(
AFilename,{$IFDEF Ver1_0}Linux{$ELSE}BaseUnix{$ENDIF}.X_OK){$IFNDEF Ver1_0}=0{$ENDIF} then
begin
AText:='"'+AFilename+'"';
case LinuxError of
@ -224,8 +224,8 @@ begin
{$IFDEF win32}
Result:=true;
{$ELSE}
Result:={$IFDEF Ver1_0}Linux{$ELSE}Unix{$ENDIF}.Access(
AFilename,{$IFDEF Ver1_0}Linux{$ELSE}Unix{$ENDIF}.R_OK);
Result:={$IFDEF Ver1_0}Linux.Access{$ELSE}BaseUnix.FpAccess{$ENDIF}(
AFilename,{$IFDEF Ver1_0}Linux{$ELSE}BaseUnix{$ENDIF}.R_OK){$IFNDEF Ver1_0}=0{$ENDIF};
{$ENDIF}
end;
@ -234,8 +234,8 @@ begin
{$IFDEF win32}
Result:=((FileGetAttr(AFilename) and faReadOnly)>0);
{$ELSE}
Result:={$IFDEF Ver1_0}Linux{$ELSE}Unix{$ENDIF}.Access(
AFilename,{$IFDEF Ver1_0}Linux{$ELSE}Unix{$ENDIF}.W_OK);
Result:={$IFDEF Ver1_0}Linux.Access{$ELSE}BaseUnix.FpAccess{$ENDIF}(
AFilename,{$IFDEF Ver1_0}Linux{$ELSE}BaseUnix{$ENDIF}.W_OK){$IFNDEF Ver1_0}=0{$ENDIF};
{$ENDIF}
end;

16
debugger/cmdlinedebugger.pp
View File

@ -84,7 +84,7 @@ uses
{$IFDEF Ver1_0}
Linux,
{$ELSE}
Unix,
Unix,BaseUnix,
{$ENDIF}
{$ENDIF}
SysUtils;
@ -99,7 +99,7 @@ begin
{.$IFDEF Linux}
{$IFDEF UNIX}
if AHandle <> 0
then Kill(AHandle, SIGINT);
then {$IFDEF Ver1_0}Kill{$ELSE}FpKill{$ENDIF}(AHandle, SIGINT);
{$ENDIF}
end;
@ -121,19 +121,19 @@ begin
Count := High(AHandles);
if Count < 0 then Exit;
if Count > 31 then Count := 31;
FD_ZERO(FDS);
{$IFDEF Ver1_0}FD_ZERO{$ELSE}FpFD_ZERO{$ENDIF}(FDS);
for n := 0 to Count do
begin
if Max < AHandles[n] then Max := AHandles[n];
if AHandles[n] <> 0
then FD_Set(AHandles[n], FDS);
then {$IFDEF Ver1_0}FD_Set{$ELSE}FpFD_Set{$ENDIF}(AHandles[n], FDS);
end;
repeat
FDSWait := FDS;
TimeOut := 10;
R := Select(Max + 1, @FDSWait, nil, nil, TimeOut);
R := {$IFDEF Ver1_0}Select{$ELSE}FpSelect{$ENDIF}(Max + 1, @FDSWait, nil, nil, TimeOut);
Application.ProcessMessages;
until R <> 0;
@ -141,7 +141,7 @@ begin
then begin
for n := 0 to Count do
if (AHandles[n] <> 0)
and (FD_ISSET(AHandles[n], FDSWait))
and ({$IFDEF Ver1_0}FD_ISSET{$ELSE}FpFD_ISSET{$ENDIF}(AHandles[n], FDSWait){$IFNDEF Ver1_0}=0{$ENDIF})
then begin
Result := Result or 1 shl n;
Dec(R);
@ -371,6 +371,10 @@ initialization
end.
{ =============================================================================
$Log$
Revision 1.23 2003/10/31 14:25:59 mazen
* Fixing VER1_1 compile problem to allow using 1.1 compiler
* Most of oldlinux unit calls are now in BaseUnix unit with prefix Fp
Revision 1.22 2003/10/16 23:54:27 marc
Implemented new gtk keyevent handling

10
ide/ideprocs.pp
View File

@ -193,7 +193,7 @@ uses
{$IFDEF Ver1_0}
,Linux
{$ELSE}
,Unix
,Unix,BaseUnix
{$ENDIF}
{$EndIf};
@ -1104,7 +1104,7 @@ begin
{$IFDEF Win32}
OldAttr:=FileGetAttr(Filename);
{$ELSE}
FStat(Filename,OldInfo);
{$IFDEF Ver1_0}FStat{$ELSE}FpStat{$ENDIF}(Filename,OldInfo);
{$ENDIF}
if not FileIsSymlink(Filename) then begin
@ -1126,7 +1126,7 @@ begin
{$IFDEF Win32}
FileSetAttr(FileName,OldAttr);
{$ELSE}
Chmod(Filename,
{$IFDEF Ver1_0}Chmod{$ELSE}FpChmod{$ENDIF}(Filename,
OldInfo.Mode and (STAT_IRWXO+STAT_IRWXG+STAT_IRWXU
+STAT_ISUID+STAT_ISGID+STAT_ISVTX));
{$ENDIF}
@ -1880,7 +1880,7 @@ begin
{$IFDEF Win32}
OldAttr:=FileGetAttr(SrcFilename);
{$ELSE}
FStat(SrcFilename,OldInfo);
{$IFDEF Ver1_0}FStat{$ELSE}FpStat{$ENDIF}(SrcFilename,OldInfo);
{$ENDIF}
//writeln('CopyFileWithMethods ',SrcFilename,' ',DestFilename);
@ -1905,7 +1905,7 @@ begin
{$IFDEF Win32}
FileSetAttr(DestFileName,OldAttr);
{$ELSE}
Chmod(DestFilename,
{$IFDEF Ver1_0}Chmod{$ELSE}FpChmod{$ENDIF}(DestFilename,
OldInfo.Mode and (STAT_IRWXO+STAT_IRWXG+STAT_IRWXU
+STAT_ISUID+STAT_ISGID+STAT_ISVTX));
{$ENDIF}

6
ide/include/linux/lazconf.inc
View File

@ -28,7 +28,7 @@
}
uses
{$IFDEF VER1_1}
unix;
unix,BaseUnix;
{$ELSE}
linux;
{$ENDIF}
@ -39,6 +39,10 @@ uses
{
$Log$
Revision 1.15 2003/10/31 14:25:59 mazen
* Fixing VER1_1 compile problem to allow using 1.1 compiler
* Most of oldlinux unit calls are now in BaseUnix unit with prefix Fp
Revision 1.14 2003/08/15 14:01:20 mattias
combined lazconf things for unix

4
ide/include/unix/lazbaseconf.inc
View File

@ -133,7 +133,7 @@ end;
---------------------------------------------------------------------------}
function FindDefaultCompilerPath: string;
begin
Result:=SearchFileInPath('ppc386','',GetEnv('PATH'),':',
Result:=SearchFileInPath('ppc386','',{$IFDEF Ver1_0}GetEnv{$ELSE}FpGetEnv{$ENDIF}('PATH'),':',
[sffDontSearchInBasePath]);
end;
@ -142,7 +142,7 @@ end;
---------------------------------------------------------------------------}
function FindDefaultMakePath: string;
begin
Result:=SearchFileInPath('make','',GetEnv('PATH'),':',
Result:=SearchFileInPath('make','',{$IFDEF Ver1_0}GetEnv{$ELSE}FpGetEnv{$ENDIF}('PATH'),':',
[sffDontSearchInBasePath]);
end;

6
lcl/filectrl.pp
View File

@ -100,7 +100,7 @@ uses
{$IFDEF win32}
Dos;
{$ELSE}
{$IFDEF Ver1_0}Linux{$ELSE}Unix{$ENDIF};
{$IFDEF Ver1_0}Linux{$ELSE}Unix,BaseUnix{$ENDIF};
{$ENDIF}
var
@ -127,6 +127,10 @@ end.
{
$Log$
Revision 1.19 2003/10/31 14:25:59 mazen
* Fixing VER1_1 compile problem to allow using 1.1 compiler
* Most of oldlinux unit calls are now in BaseUnix unit with prefix Fp
Revision 1.18 2003/09/02 21:32:56 mattias
implemented TOpenPictureDialog

32
lcl/include/filectrl.inc
View File

@ -378,7 +378,7 @@ begin
{$IFDEF win32}
raise Exception.Create('"'+AFilename+'" is not symlink');
{$ELSE}
if {$IFDEF Ver1_0}Linux{$ELSE}Unix{$ENDIF}.ReadLink(AFilename)='' then begin
if {$IFDEF Ver1_0}Linux.ReadLink{$ELSE}Unix.FpReadLink{$ENDIF}(AFilename)='' then begin
AText:='"'+AFilename+'"';
case LinuxError of
{$IFDEF Ver1_0}sys_eacces{$ELSE}ESysEAcces{$ENDIF}:
@ -408,7 +408,7 @@ begin
{$IFDEF win32}
Result:=false;
{$ELSE}
Result:=({$IFDEF Ver1_0}Linux{$ELSE}Unix{$ENDIF}.ReadLink(AFilename)<>'');
Result:=({$IFDEF Ver1_0}Linux.ReadLink{$ELSE}Unix.FpReadLink{$ENDIF}(AFilename)<>'');
{$ENDIF}
end;
@ -420,8 +420,8 @@ begin
{$IFDEF win32}
Result:=true;
{$ELSE}
Result:={$IFDEF Ver1_0}Linux{$ELSE}Unix{$ENDIF}.Access(
AFilename,{$IFDEF Ver1_0}Linux{$ELSE}Unix{$ENDIF}.R_OK);
Result:={$IFDEF Ver1_0}Linux.Access({$ELSE}BaseUnix.FpAccess({$ENDIF}
AFilename,{$IFDEF Ver1_0}Linux{$ELSE}BaseUnix{$ENDIF}.R_OK){$IFNDEF Ver1_0}=0{$ENDIF};
{$ENDIF}
end;
@ -433,8 +433,8 @@ begin
{$IFDEF win32}
Result:=((FileGetAttr(AFilename) and faReadOnly)=0);
{$ELSE}
Result:={$IFDEF Ver1_0}Linux{$ELSE}Unix{$ENDIF}.Access(
AFilename,{$IFDEF Ver1_0}Linux{$ELSE}Unix{$ENDIF}.W_OK);
Result:={$IFDEF Ver1_0}Linux.Access{$ELSE}BaseUnix.FpAccess{$ENDIF}(
AFilename,{$IFDEF Ver1_0}Linux{$ELSE}BaseUnix{$ENDIF}.W_OK){$IFNDEF Ver1_0}=0{$ENDIF};
{$ENDIF}
end;
@ -445,7 +445,7 @@ function GetFileDescription(const AFilename: string): string;
{$IFDEF win32}
{$ELSE}
var
info: stat;
info: Stat;
// permissions
// user
// group
@ -458,7 +458,7 @@ begin
{$IFDEF win32}
{$ELSE}
if not FStat(AFilename,info) then exit;
if not {$IFDEF Ver1_0}FStat{$ELSE}FpStat{$ENDIF}(AFilename,info){$IFNDEF Ver1_0}=0{$ENDIF} then exit;
// permissions
// file type
@ -550,7 +550,7 @@ begin
{$ELSE}
repeat
LinkFilename:={$IFDEF Ver1_0}Linux{$ELSE}Unix{$ENDIF}.ReadLink(Result);
LinkFilename:={$IFDEF Ver1_0}Linux.ReadLink{$ELSE}Unix.FpReadLink{$ENDIF}(Result);
if LinkFilename='' then begin
AText:='"'+Filename+'"';
case LinuxError of
@ -603,8 +603,8 @@ begin
{$IFDEF win32}
Result:=true;
{$ELSE}
Result:={$IFDEF Ver1_0}Linux{$ELSE}Unix{$ENDIF}.Access(
AFilename,{$IFDEF Ver1_0}Linux{$ELSE}Unix{$ENDIF}.X_OK);
Result:={$IFDEF Ver1_0}Linux.Access{$ELSE}BaseUnix.FpAccess{$ENDIF}(
AFilename,{$IFDEF Ver1_0}Linux{$ELSE}BaseUnix{$ENDIF}.X_OK){$IFNDEF Ver1_0}=0{$ENDIF};
{$ENDIF}
end;
@ -625,8 +625,8 @@ begin
raise Exception.Create('file "'+AFilename+'" is a directory and not an executable');
end;
{$IFNDEF win32}
if not{$IFDEF Ver1_0}Linux{$ELSE}Unix{$ENDIF}.Access(
AFilename,{$IFDEF Ver1_0}Linux{$ELSE}Unix{$ENDIF}.X_OK) then
if not{$IFDEF Ver1_0}Linux.Access{$ELSE}BaseUnix.FpAccess{$ENDIF}(
AFilename,{$IFDEF Ver1_0}Linux{$ELSE}BaseUnix{$ENDIF}.X_OK){$IFNDEF Ver1_0}=0{$ENDIF} then
begin
AText:='"'+AFilename+'"';
case LinuxError of
@ -715,7 +715,7 @@ begin
Result:=ParamStr(0);
if ExtractFilePath(Result)='' then begin
// program was started via PATH
Result:=SearchFileInPath(Result,'',GetEnv('PATH'),':',
Result:=SearchFileInPath(Result,'',{$IFDEF Ver1_0}GetEnv{$ELSE}FpGetEnv{$ENDIF}('PATH'),':',
[sffDontSearchInBasePath]);
end;
// resolve links
@ -886,6 +886,10 @@ end;
{
$Log$
Revision 1.30 2003/10/31 14:25:59 mazen
* Fixing VER1_1 compile problem to allow using 1.1 compiler
* Most of oldlinux unit calls are now in BaseUnix unit with prefix Fp
Revision 1.29 2003/09/12 07:17:47 mattias
fixed win32 FileIsWritable