Преглед изворни кода

* fixed compilation on MacOS

olle пре 20 година
родитељ
комит
e90d15bd5e
2 измењених фајлова са 14 додато и 6 уклоњено
  1. 8 1
      compiler/fpcdefs.inc
  2. 6 5
      compiler/globals.pas

+ 8 - 1
compiler/fpcdefs.inc

@@ -89,9 +89,16 @@
   {$define cpufpemu}
   {$define cpufpemu}
 {$endif m68k}
 {$endif m68k}
 
 
+{$IFDEF MACOS}
+{$DEFINE MACOS_USE_FAKE_SYSUTILS}
+{$ENDIF MACOS}
+
 {
 {
   $Log$
   $Log$
-  Revision 1.47  2004-11-14 16:26:29  florian
+  Revision 1.48  2005-02-08 22:33:51  olle
+    * fixed compilation on MacOS
+
+  Revision 1.47  2004/11/14 16:26:29  florian
     * fixed morphos syscall
     * fixed morphos syscall
 
 
   Revision 1.46  2004/10/31 18:54:24  peter
   Revision 1.46  2004/10/31 18:54:24  peter

+ 6 - 5
compiler/globals.pas

@@ -355,13 +355,11 @@ interface
        be placed in data/const segment, according to the current alignment requirements }
        be placed in data/const segment, according to the current alignment requirements }
     function const_align(siz: longint): longint;
     function const_align(siz: longint): longint;
 
 
-{$IFDEF MACOS}
+{$IFDEF MACOS_USE_FAKE_SYSUTILS}
 
 
 {Since SysUtils is not yet available for MacOS, fake
 {Since SysUtils is not yet available for MacOS, fake
  Exceptions classes are included here.}
  Exceptions classes are included here.}
 
 
-{$DEFINE MACOS_USE_FAKE_SYSUTILS}
-
 type
 type
    { exceptions }
    { exceptions }
    Exception = class(TObject);
    Exception = class(TObject);
@@ -381,7 +379,7 @@ type
    EOverflow   = Class(EMathError);
    EOverflow   = Class(EMathError);
    EUnderflow  = Class(EMathError);
    EUnderflow  = Class(EMathError);
 
 
-{$ENDIF MACOS}
+{$ENDIF MACOS_USE_FAKE_SYSUTILS}
 
 
 implementation
 implementation
 
 
@@ -2291,7 +2289,10 @@ end;
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.170  2005-02-07 21:30:25  florian
+  Revision 1.171  2005-02-08 22:33:51  olle
+    * fixed compilation on MacOS
+
+  Revision 1.170  2005/02/07 21:30:25  florian
     * fixed typo in define
     * fixed typo in define
 
 
   Revision 1.169  2005/02/06 21:33:28  peter
   Revision 1.169  2005/02/06 21:33:28  peter