Forráskód Böngészése

* more hasunix fixes

marco 22 éve
szülő
commit
04b80d3123
3 módosított fájl, 23 hozzáadás és 14 törlés
  1. 7 4
      compiler/assemble.pas
  2. 10 7
      compiler/globals.pas
  3. 6 3
      compiler/script.pas

+ 7 - 4
compiler/assemble.pas

@@ -173,7 +173,7 @@ interface
 Implementation
 Implementation
 
 
     uses
     uses
-{$ifdef unix}
+{$ifdef hasunix}
   {$ifdef ver1_0}
   {$ifdef ver1_0}
       linux,
       linux,
   {$else}
   {$else}
@@ -510,7 +510,7 @@ Implementation
       begin
       begin
         if SmartAsm then
         if SmartAsm then
          NextSmartName(Aplace);
          NextSmartName(Aplace);
-{$ifdef unix}
+{$ifdef hasunix}
         if DoPipe then
         if DoPipe then
          begin
          begin
            Message1(exec_i_assembling_pipe,asmfile);
            Message1(exec_i_assembling_pipe,asmfile);
@@ -538,7 +538,7 @@ Implementation
         l : longint;
         l : longint;
       begin
       begin
         AsmFlush;
         AsmFlush;
-{$ifdef unix}
+{$ifdef hasunix}
         if DoPipe then
         if DoPipe then
          PClose(outfile)
          PClose(outfile)
         else
         else
@@ -1607,7 +1607,10 @@ Implementation
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.48  2002-11-24 18:21:49  carl
+  Revision 1.49  2003-01-10 21:49:00  marco
+   * more hasunix fixes
+
+  Revision 1.48  2002/11/24 18:21:49  carl
     - remove some unused defines
     - remove some unused defines
 
 
   Revision 1.47  2002/11/17 16:31:55  carl
   Revision 1.47  2002/11/17 16:31:55  carl

+ 10 - 7
compiler/globals.pas

@@ -33,7 +33,7 @@ interface
 {$ifdef win32}
 {$ifdef win32}
       windows,
       windows,
 {$endif}
 {$endif}
-{$ifdef unix}
+{$ifdef hasunix}
   {$ifdef ver1_0}
   {$ifdef ver1_0}
       linux,
       linux,
   {$else}
   {$else}
@@ -950,12 +950,12 @@ implementation
 
 
    Function GetFileTime ( Var F : File) : Longint;
    Function GetFileTime ( Var F : File) : Longint;
      Var
      Var
-     {$ifdef unix}
+     {$ifdef hasunix}
        Info : Stat;
        Info : Stat;
      {$endif}
      {$endif}
        L : longint;
        L : longint;
      begin
      begin
-     {$ifdef unix}
+     {$ifdef hasunix}
        FStat (F,Info);
        FStat (F,Info);
        L:=Info.Mtime;
        L:=Info.Mtime;
      {$else}
      {$else}
@@ -1071,7 +1071,7 @@ implementation
         hp,p,p2 : pchar;
         hp,p,p2 : pchar;
       {$endif}
       {$endif}
       begin
       begin
-      {$ifdef unix}
+      {$ifdef hasunix}
         GetEnvPchar:={$ifdef ver1_0}Linux{$else}Unix{$endif}.Getenv(envname);
         GetEnvPchar:={$ifdef ver1_0}Linux{$else}Unix{$endif}.Getenv(envname);
         {$define GETENVOK}
         {$define GETENVOK}
       {$endif}
       {$endif}
@@ -1111,7 +1111,7 @@ implementation
 
 
     procedure FreeEnvPChar(p:pchar);
     procedure FreeEnvPChar(p:pchar);
       begin
       begin
-      {$ifndef unix}
+      {$ifndef hasunix}
        {$ifndef os2}
        {$ifndef os2}
         StrDispose(p);
         StrDispose(p);
        {$endif}
        {$endif}
@@ -1122,7 +1122,7 @@ implementation
     Procedure Shell(const command:string);
     Procedure Shell(const command:string);
       { This is already defined in the linux.ppu for linux, need for the *
       { This is already defined in the linux.ppu for linux, need for the *
         expansion under linux }
         expansion under linux }
-      {$ifdef unix}
+      {$ifdef hasunix}
       begin
       begin
         {$ifdef ver1_0}Linux{$else}Unix{$endif}.Shell(command);
         {$ifdef ver1_0}Linux{$else}Unix{$endif}.Shell(command);
       end;
       end;
@@ -1525,7 +1525,10 @@ implementation
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.80  2003-01-04 16:20:44  hajny
+  Revision 1.81  2003-01-10 21:49:00  marco
+   * more hasunix fixes
+
+  Revision 1.80  2003/01/04 16:20:44  hajny
     * modified to make use of the common GetEnv code under OS/2
     * modified to make use of the common GetEnv code under OS/2
 
 
   Revision 1.79  2002/12/25 01:26:17  peter
   Revision 1.79  2002/12/25 01:26:17  peter

+ 6 - 3
compiler/script.pas

@@ -93,7 +93,7 @@ Procedure GenerateAsmRes(const st : string);
 implementation
 implementation
 
 
 uses
 uses
-{$ifdef Unix}
+{$ifdef hasUnix}
   {$ifdef ver1_0}
   {$ifdef ver1_0}
     Linux,
     Linux,
   {$else}
   {$else}
@@ -172,7 +172,7 @@ begin
   while not data.Empty do
   while not data.Empty do
    Writeln(t,data.GetFirst);
    Writeln(t,data.GetFirst);
   Close(t);
   Close(t);
-{$ifdef Unix}
+{$ifdef hasUnix}
   if executable then
   if executable then
    ChMod(fn,493);
    ChMod(fn,493);
 {$endif}
 {$endif}
@@ -415,7 +415,10 @@ end;
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.18  2003-01-06 20:16:42  peter
+  Revision 1.19  2003-01-10 21:49:00  marco
+   * more hasunix fixes
+
+  Revision 1.18  2003/01/06 20:16:42  peter
     * don't prepend ./ to quoted filenames
     * don't prepend ./ to quoted filenames
 
 
   Revision 1.17  2002/11/15 01:58:54  peter
   Revision 1.17  2002/11/15 01:58:54  peter