Selaa lähdekoodia

atari: enable FPC_STDOUT_TRUE_ALIAS and groom some of the other defines

git-svn-id: trunk@38198 -
Károly Balogh 7 vuotta sitten
vanhempi
commit
3d16d38f10
1 muutettua tiedostoa jossa 8 lisäystä ja 4 poistoa
  1. 8 4
      rtl/atari/system.pp

+ 8 - 4
rtl/atari/system.pp

@@ -18,7 +18,8 @@ unit System;
 
 
 interface
 interface
 
 
-{$define FPC_HAS_ANSI_TEXTFILEREC}
+{$define FPC_STDOUT_TRUE_ALIAS}
+{$define FPC_ANSI_TEXTFILEREC}
 {$define FPC_ATARI_USE_TINYHEAP}
 {$define FPC_ATARI_USE_TINYHEAP}
 
 
 {$ifdef FPC_ATARI_USE_TINYHEAP}
 {$ifdef FPC_ATARI_USE_TINYHEAP}
@@ -143,10 +144,11 @@ procedure SysInitStdIO;
 begin
 begin
   OpenStdIO(Input,fmInput,StdInputHandle);
   OpenStdIO(Input,fmInput,StdInputHandle);
   OpenStdIO(Output,fmOutput,StdOutputHandle);
   OpenStdIO(Output,fmOutput,StdOutputHandle);
+  OpenStdIO(ErrOutput,fmOutput,StdErrorHandle);
+{$ifndef FPC_STDOUT_TRUE_ALIAS}
   OpenStdIO(StdOut,fmOutput,StdOutputHandle);
   OpenStdIO(StdOut,fmOutput,StdOutputHandle);
-
   OpenStdIO(StdErr,fmOutput,StdErrorHandle);
   OpenStdIO(StdErr,fmOutput,StdErrorHandle);
-  OpenStdIO(ErrOutput,fmOutput,StdErrorHandle);
+{$endif FPC_STDOUT_TRUE_ALIAS}
 end;
 end;
 
 
 function CheckInitialStkLen (StkLen: SizeUInt): SizeUInt;
 function CheckInitialStkLen (StkLen: SizeUInt): SizeUInt;
@@ -164,7 +166,9 @@ begin
   InitHeap;
   InitHeap;
 {$endif FPC_ATARI_USE_TINYHEAP}
 {$endif FPC_ATARI_USE_TINYHEAP}
   SysInitExceptions;
   SysInitExceptions;
+{$ifdef FPC_HAS_FEATURE_UNICODESTRINGS}
   InitUnicodeStringManager;
   InitUnicodeStringManager;
+{$endif FPC_HAS_FEATURE_UNICODESTRINGS}
 { Setup stdin, stdout and stderr }
 { Setup stdin, stdout and stderr }
   SysInitStdIO;
   SysInitStdIO;
 { Reset IO Error }
 { Reset IO Error }
@@ -173,5 +177,5 @@ begin
   SysInitParamsAndEnv;
   SysInitParamsAndEnv;
 {$ifdef FPC_HAS_FEATURE_THREADING}
 {$ifdef FPC_HAS_FEATURE_THREADING}
   InitSystemThreads;
   InitSystemThreads;
-{$endif}
+{$endif FPC_HAS_FEATURE_THREADING}
 end.
 end.