paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-14 14:09:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

* respect feature defines

Browse Source 
git-svn-id: trunk@30378 -
This commit is contained in:
florian 2015-03-29 19:43:25 +00:00
parent 5030ff05b5
commit d0f4e7cc99
5 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtl/inc/dos.inc
View File

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

4
rtl/inc/dosh.inc
View File

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

16
rtl/inc/exeinfo.pp
View File

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

11
rtl/inc/iso7185.pp
View File

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

6
rtl/objpas/sysconst.pp
View File

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