marco před 22 roky
rodič
revize
4144f93ce5
4 změnil soubory, kde provedl 34 přidání a 18 odebrání
  1. 8 5
      compiler/catch.pas
  2. 12 5
      compiler/globals.pas
  3. 6 3
      compiler/script.pas
  4. 8 5
      compiler/utils/ppumove.pp

+ 8 - 5
compiler/catch.pas

@@ -45,7 +45,7 @@ uses
   {$ifdef ver1_0}
     Linux,
   {$else}
-    Unix,
+    BaseUnix,Unix,
   {$endif}
  {$endif}
 {$endif}
@@ -106,17 +106,20 @@ begin
   {$ifdef has_signal}
     NewSignal:=SignalHandler({$ifdef fpcprocvar}@{$endif}CatchSignal);
     {$ifndef sunos}
-      OldSigSegm:=Signal (SIGSEGV,NewSignal);
+      OldSigSegm:={$ifdef VER1_0}Signal{$else}fpSignal{$endif} (SIGSEGV,NewSignal);
     {$endif} // lxrun on solaris hooks this for handling linux-calls!
-    OldSigInt:=Signal (SIGINT,NewSignal);
-    OldSigFPE:=Signal (SIGFPE,NewSignal);
+    OldSigInt:={$ifdef VER1_0}Signal{$else}fpSignal{$endif}  (SIGINT,NewSignal);
+    OldSigFPE:={$ifdef VER1_0}Signal{$else}fpSignal{$endif}  (SIGFPE,NewSignal);
   {$endif}
 {$endif nocatch}
 end.
 
 {
   $Log$
-  Revision 1.14  2003-09-05 17:41:12  florian
+  Revision 1.15  2003-09-14 20:26:18  marco
+   * Unix reform
+
+  Revision 1.14  2003/09/05 17:41:12  florian
     * merged Wiktor's Watcom patches in 1.1
 
   Revision 1.13  2003/04/23 10:10:31  peter

+ 12 - 5
compiler/globals.pas

@@ -37,7 +37,7 @@ interface
   {$ifdef ver1_0}
       linux,
   {$else}
-      unix,
+      Baseunix,unix,
   {$endif}
 {$endif}
 {$ifdef Delphi}
@@ -968,12 +968,16 @@ implementation
    Function GetFileTime ( Var F : File) : Longint;
      Var
      {$ifdef hasunix}
-       Info : Stat;
+	info: Stat; 
      {$endif}
        L : longint;
      begin
      {$ifdef hasunix}
-       FStat (F,Info);
+       {$IFDEF VER1_0}
+        FStat (F,Info);
+       {$ELSE}
+        FPFStat (F,Info);
+       {$ENDIF}
        L:=Info.Mtime;
      {$else}
        GetFTime(f,l);
@@ -1158,7 +1162,7 @@ implementation
       {$endif}
       begin
       {$ifdef hasunix}
-        GetEnvPchar:={$ifdef ver1_0}Linux{$else}Unix{$endif}.Getenv(envname);
+        GetEnvPchar:={$ifdef ver1_0}Linux.getenv{$else}BaseUnix.fpGetEnv{$endif}(envname);
         {$define GETENVOK}
       {$endif}
       {$ifdef win32}
@@ -1674,7 +1678,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.98  2003-09-14 12:55:06  jonas
+  Revision 1.99  2003-09-14 20:26:18  marco
+   * Unix reform
+
+  Revision 1.98  2003/09/14 12:55:06  jonas
     * fixed compilation for non-x86
 
   Revision 1.97  2003/09/07 22:09:34  peter

+ 6 - 3
compiler/script.pas

@@ -97,7 +97,7 @@ uses
   {$ifdef ver1_0}
     Linux,
   {$else}
-    Unix,
+    BaseUnix,Unix,
   {$endif}
 {$endif}
   cutils,
@@ -174,7 +174,7 @@ begin
   Close(t);
 {$ifdef hasUnix}
   if executable then
-   ChMod(fn,493);
+   {$ifdef VER1_0}ChMod{$else}fpchmod{$endif}(fn,493);
 {$endif}
 end;
 
@@ -419,7 +419,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.21  2003-04-22 14:33:38  peter
+  Revision 1.22  2003-09-14 20:26:18  marco
+   * Unix reform
+
+  Revision 1.21  2003/04/22 14:33:38  peter
     * removed some notes/hints
 
   Revision 1.20  2003/02/07 21:21:39  marco

+ 8 - 5
compiler/utils/ppumove.pp

@@ -28,7 +28,7 @@ uses
   {$ifdef ver1_0}
   linux,
   {$else}
-  unix,
+  Baseunix,Unix,
   {$endif}
 {$else unix}
   dos,
@@ -133,7 +133,7 @@ Var
 {$endif}
 begin
 {$ifdef unix}
-  FileExists:=FStat (F,Info);
+  FileExists:={$ifdef VER1_0}FStat{$ELSE}FpStat{$endif} (F,Info){$ifndef VER1_0}=0{$endif};
 {$else}
   FindFirst (F,anyfile,Info);
   FileExists:=DosError=0;
@@ -473,7 +473,7 @@ begin
    Error('Fatal: Library building stage failed.',true);
 { fix permission to 644, so it's not 755 }
 {$ifdef unix}
-  ChMod(OutputFile,420);
+  {$ifdef VER1_0}ChMod{$ELSE}FPChmod{$endif}(OutputFile,420);
 {$endif}
 { Rename to the destpath }
   if DestPath<>'' then
@@ -605,7 +605,7 @@ begin
       Writeln('Writing pmove'+BatchExt);
      Close(BatchFile);
 {$ifdef unix}
-     ChMod('pmove'+BatchExt,493);
+  {$ifdef VER1_0}ChMod{$ELSE}FPChmod{$endif}('pmove'+BatchExt,493);
 {$endif}
    end;
 { The End }
@@ -614,7 +614,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.5  2002-05-18 13:34:27  peter
+  Revision 1.6  2003-09-14 20:26:18  marco
+   * Unix reform
+
+  Revision 1.5  2002/05/18 13:34:27  peter
     * readded missing revisions
 
   Revision 1.4  2002/05/16 19:46:54  carl