Selaa lähdekoodia

* respect feature defines

git-svn-id: trunk@30378 -
florian 10 vuotta sitten
vanhempi
commit
d0f4e7cc99
5 muutettua tiedostoa jossa 35 lisäystä ja 6 poistoa
  1. 4 0
      rtl/inc/dos.inc
  2. 4 0
      rtl/inc/dosh.inc
  3. 10 6
      rtl/inc/exeinfo.pp
  4. 11 0
      rtl/inc/iso7185.pp
  5. 6 0
      rtl/objpas/sysconst.pp

+ 4 - 0
rtl/inc/dos.inc

@@ -35,7 +35,11 @@ begin
 end;
 
 {$IFNDEF HAS_DOSEXITCODE}
+{$ifdef FPC_HAS_FEATURE_THREADING}
 threadvar
+{$else FPC_HAS_FEATURE_THREADING}
+var
+{$endif FPC_HAS_FEATURE_THREADING}
   LastDosExitCode: longint;
 
 function DosExitCode: word;

+ 4 - 0
rtl/inc/dosh.inc

@@ -72,7 +72,11 @@ Type
     Sec   : word;
   End;
 
+{$ifdef FPC_HAS_FEATURE_THREADING}
 threadvar
+{$else FPC_HAS_FEATURE_THREADING}
+var
+{$endif FPC_HAS_FEATURE_THREADING}
   DosError : integer;
 
 {$ifdef cpui386}

+ 10 - 6
rtl/inc/exeinfo.pp

@@ -99,7 +99,11 @@ uses
   procedure GetModuleByAddr(addr: pointer; var baseaddr: pointer; var filename: string);
     begin
       baseaddr:= nil;
+{$ifdef FPC_HAS_FEATURE_COMMANDARGS}
       filename:=ParamStr(0);
+{$else FPC_HAS_FEATURE_COMMANDARGS}
+      filename:='';
+{$endif FPC_HAS_FEATURE_COMMANDARGS}
     end;
 
 {$endif windows}
@@ -180,7 +184,7 @@ function getByte(var f:file):byte;
   begin
     for i := 1 to bytes do getbyte(f);
   end;
-  
+
   function get0String (var f:file) : string;
   var c : char;
   begin
@@ -192,7 +196,7 @@ function getByte(var f:file):byte;
       c := char (getbyte(f));
     end;
   end;
-  
+
   function getint32 (var f:file): longint;
   begin
     blockread (F, getint32, 4);
@@ -209,7 +213,7 @@ var valid : boolean;
     hdrLength,
     dataOffset,
     dataLength : longint;
-  
+
 
   function getLString : String;
   var Res:string;
@@ -235,12 +239,12 @@ var valid : boolean;
     blockread (e.F, getword, 2);
   end;
 
-  
+
 
 begin
   e.sechdrofs := 0;
   openNetwareNLM:=false;
-  
+
   // read and check header
   Skip (e.f,SIZE_OF_NLM_INTERNAL_FIXED_HEADER);
   getLString;  // NLM Description
@@ -840,7 +844,7 @@ const
    B_ADD_ON_IMAGE  = 3;
    B_SYSTEM_IMAGE  = 4;
    B_OK = 0;
-   
+
 type
     image_info = packed record
      id      : image_id;

+ 11 - 0
rtl/inc/iso7185.pp

@@ -49,8 +49,17 @@ unit iso7185;
 
 {$i-}
     procedure DoAssign(var t : Text);
+{$ifndef FPC_HAS_FEATURE_RANDOM}
+      const
+        NextIndex : Word = 1;
+{$endif FPC_HAS_FEATURE_RANDOM}
       begin
+{$ifdef FPC_HAS_FEATURE_RANDOM}
         Assign(t,'fpc_'+HexStr(random(1000000000),8)+'.tmp');
+{$else FPC_HAS_FEATURE_RANDOM}
+        Assign(t,'fpc_'+HexStr(NextIndex,4)+'.tmp');
+        Inc(NextIndex);
+{$endif FPC_HAS_FEATURE_RANDOM}
       end;
 
 
@@ -172,7 +181,9 @@ unit iso7185;
 begin
   { we shouldn't do this because it might confuse user programs, but for now it
     is good enough to get pretty unique tmp file names }
+{$ifdef FPC_HAS_FEATURE_RANDOM}
   Randomize;
+{$endif FPC_HAS_FEATURE_RANDOM}
   { reset opens with read-only }
   Filemode:=0;
 end.

+ 6 - 0
rtl/objpas/sysconst.pp

@@ -12,12 +12,18 @@
 
  **********************************************************************}
 {$mode objfpc}
+{$ifdef FPC_HAS_FEATURE_ANSISTRINGS}
 {$H+}
+{$endif FPC_HAS_FEATURE_ANSISTRINGS}
 unit sysconst;
 
 interface
 
+{$ifdef FPC_HAS_FEATURE_ANSISTRINGS}
 resourcestring
+{$else FPC_HAS_FEATURE_ANSISTRINGS}
+const
+{$endif FPC_HAS_FEATURE_ANSISTRINGS}
 
 { from old str*.inc files }