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

* removed all ver2_* defines older than 2_4. 2_4 can probably also get removed from trunk, but better in a separate commit.

Browse Source 
git-svn-id: trunk@24971 -
This commit is contained in:
marco 2013-06-25 12:46:30 +00:00
parent 89c9cdf6c4
commit eebfeca41d
6 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
rtl/inc/astrings.inc
View File

@ -142,7 +142,7 @@ Procedure fpc_ansistr_decr_ref (Var S : Pointer); [external name 'FPC_ANSISTR_DE
{$ifndef FPC_SYSTEM_HAS_ANSISTR_INCR_REF} {$ifndef FPC_SYSTEM_HAS_ANSISTR_INCR_REF}
{$define FPC_SYSTEM_HAS_ANSISTR_INCR_REF} {$define FPC_SYSTEM_HAS_ANSISTR_INCR_REF}
Procedure fpc_AnsiStr_Incr_Ref (S : Pointer); [Public,Alias:'FPC_ANSISTR_INCR_REF']; compilerproc; {$IFNDEF VER2_0} Inline; {$ENDIF} Procedure fpc_AnsiStr_Incr_Ref (S : Pointer); [Public,Alias:'FPC_ANSISTR_INCR_REF']; compilerproc; inline;
Begin Begin
If S=Nil then If S=Nil then
exit; exit;
@ -848,7 +848,7 @@ end;
{$define FPC_SYSTEM_HAS_ANSISTR_UNIQUE} {$define FPC_SYSTEM_HAS_ANSISTR_UNIQUE}
// MV: inline the basic checks for case that S is already unique. // MV: inline the basic checks for case that S is already unique.
// Rest is too complex to inline, so factor that out as a call. // Rest is too complex to inline, so factor that out as a call.
Function fpc_ansistr_Unique(Var S : Pointer): Pointer; [Public,Alias : 'FPC_ANSISTR_UNIQUE']; compilerproc; {$IFNDEF VER2_0} Inline; {$ENDIF} Function fpc_ansistr_Unique(Var S : Pointer): Pointer; [Public,Alias : 'FPC_ANSISTR_UNIQUE']; compilerproc; inline;
{ {
Make sure reference count of S is 1, Make sure reference count of S is 1,
using copy-on-write semantics. using copy-on-write semantics.
@ -1110,7 +1110,7 @@ end;
{$ifndef FPUNONE} {$ifndef FPUNONE}
procedure fpc_AnsiStr_Float(d : ValReal;len,fr,rt : SizeInt;out s : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING});[public,alias:'FPC_ANSISTR_FLOAT']; compilerproc; {$IFNDEF VER2_0} Inline; {$ENDIF} procedure fpc_AnsiStr_Float(d : ValReal;len,fr,rt : SizeInt;out s : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING});[public,alias:'FPC_ANSISTR_FLOAT']; compilerproc; inline;
var var
ss: ShortString; ss: ShortString;
begin begin
@ -1123,7 +1123,7 @@ end;
{$endif} {$endif}
{$ifndef FPC_STR_ENUM_INTERN} {$ifndef FPC_STR_ENUM_INTERN}
procedure fpc_ansistr_enum(ordinal,len:sizeint;typinfo,ord2strindex:pointer;out s:RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING});[public,alias:'FPC_ANSISTR_ENUM'];compilerproc; {$IFNDEF VER2_0} Inline; {$ENDIF} procedure fpc_ansistr_enum(ordinal,len:sizeint;typinfo,ord2strindex:pointer;out s:RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING});[public,alias:'FPC_ANSISTR_ENUM'];compilerproc; inline;
var ss:shortstring; var ss:shortstring;
@ -1137,7 +1137,7 @@ end;
{$endif FPC_STR_ENUM_INTERN} {$endif FPC_STR_ENUM_INTERN}
procedure fpc_ansistr_bool(b : boolean;len:sizeint;out s:RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING});[public,alias:'FPC_ANSISTR_BOOL'];compilerproc; {$IFNDEF VER2_0} Inline; {$ENDIF} procedure fpc_ansistr_bool(b : boolean;len:sizeint;out s:RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING});[public,alias:'FPC_ANSISTR_BOOL'];compilerproc; inline;
var var
ss:shortstring; ss:shortstring;
begin begin
@ -1159,7 +1159,7 @@ end;
{$ifdef FPC_HAS_STR_CURRENCY} {$ifdef FPC_HAS_STR_CURRENCY}
procedure fpc_AnsiStr_Currency(c : currency;len,fr : SizeInt;out s : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING});[public,alias:'FPC_ANSISTR_CURRENCY']; compilerproc; {$IFNDEF VER2_0} Inline; {$ENDIF} procedure fpc_AnsiStr_Currency(c : currency;len,fr : SizeInt;out s : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING});[public,alias:'FPC_ANSISTR_CURRENCY']; compilerproc; inline;
var var
ss: ShortString; ss: ShortString;
begin begin
@ -1171,7 +1171,7 @@ begin
end; end;
{$endif FPC_HAS_STR_CURRENCY} {$endif FPC_HAS_STR_CURRENCY}
Procedure fpc_AnsiStr_UInt(v : ValUInt;Len : SizeInt; out S : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING});[Public,Alias : 'FPC_ANSISTR_VALUINT']; compilerproc; {$IFNDEF VER2_0} Inline; {$ENDIF} Procedure fpc_AnsiStr_UInt(v : ValUInt;Len : SizeInt; out S : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING});[Public,Alias : 'FPC_ANSISTR_VALUINT']; compilerproc; inline;
Var Var
SS : ShortString; SS : ShortString;
begin begin
@ -1184,7 +1184,7 @@ end;
Procedure fpc_AnsiStr_SInt(v : ValSInt;Len : SizeInt; out S : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING});[Public,Alias : 'FPC_ANSISTR_VALSINT']; compilerproc; {$IFNDEF VER2_0} Inline; {$ENDIF} Procedure fpc_AnsiStr_SInt(v : ValSInt;Len : SizeInt; out S : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING});[Public,Alias : 'FPC_ANSISTR_VALSINT']; compilerproc; inline;
Var Var
SS : ShortString; SS : ShortString;
begin begin
@ -1198,7 +1198,7 @@ end;
{$ifndef CPU64} {$ifndef CPU64}
Procedure fpc_AnsiStr_QWord(v : QWord;Len : SizeInt; out S : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING});[Public,Alias : 'FPC_ANSISTR_QWORD']; compilerproc; {$IFNDEF VER2_0} Inline; {$ENDIF} Procedure fpc_AnsiStr_QWord(v : QWord;Len : SizeInt; out S : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING});[Public,Alias : 'FPC_ANSISTR_QWORD']; compilerproc; inline;
Var Var
SS : ShortString; SS : ShortString;
begin begin
@ -1209,7 +1209,7 @@ begin
{$endif FPC_HAS_CPSTRING} {$endif FPC_HAS_CPSTRING}
end; end;
Procedure fpc_AnsiStr_Int64(v : Int64; Len : SizeInt; out S : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING});[Public,Alias : 'FPC_ANSISTR_INT64']; compilerproc; {$IFNDEF VER2_0} Inline; {$ENDIF} Procedure fpc_AnsiStr_Int64(v : Int64; Len : SizeInt; out S : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING});[Public,Alias : 'FPC_ANSISTR_INT64']; compilerproc; inline;
Var Var
SS : ShortString; SS : ShortString;
begin begin
@ -1223,7 +1223,7 @@ end;
{$endif CPU64} {$endif CPU64}
{$if defined(CPU16) or defined(CPU8)} {$if defined(CPU16) or defined(CPU8)}
Procedure fpc_AnsiStr_LongWord(v : LongWord;Len : SizeInt; out S : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING});[Public,Alias : 'FPC_ANSISTR_LONGWORD']; compilerproc; {$IFNDEF VER2_0} Inline; {$ENDIF} Procedure fpc_AnsiStr_LongWord(v : LongWord;Len : SizeInt; out S : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING});[Public,Alias : 'FPC_ANSISTR_LONGWORD']; compilerproc; inline;
Var Var
SS : ShortString; SS : ShortString;
begin begin
@ -1234,7 +1234,7 @@ begin
{$endif FPC_HAS_CPSTRING} {$endif FPC_HAS_CPSTRING}
end; end;
Procedure fpc_AnsiStr_LongInt(v : LongInt; Len : SizeInt; out S : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING});[Public,Alias : 'FPC_ANSISTR_LONGINT']; compilerproc; {$IFNDEF VER2_0} Inline; {$ENDIF} Procedure fpc_AnsiStr_LongInt(v : LongInt; Len : SizeInt; out S : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING});[Public,Alias : 'FPC_ANSISTR_LONGINT']; compilerproc; inline;
Var Var
SS : ShortString; SS : ShortString;
begin begin
@ -1303,7 +1303,7 @@ end;
{$endif FPC_HAS_ANSISTR_OF_CHAR} {$endif FPC_HAS_ANSISTR_OF_CHAR}
Procedure SetString(Out S : AnsiString; Buf : PAnsiChar; Len : SizeInt); {$IFNDEF VER2_0} Inline; {$ENDIF} Procedure SetString(Out S : AnsiString; Buf : PAnsiChar; Len : SizeInt); inline;
begin begin
SetLength(S,Len); SetLength(S,Len);
If (Buf<>Nil) then If (Buf<>Nil) then

2
rtl/inc/ucomplex.pp
View File

@ -12,10 +12,8 @@
**********************************************************************} **********************************************************************}
Unit UComplex; Unit UComplex;
{$ifndef VER2_0}
{$INLINE ON} {$INLINE ON}
{$define TEST_INLINE} {$define TEST_INLINE}
{$endif VER2_0}
{ created for FPC by Pierre Muller } { created for FPC by Pierre Muller }
{ inpired from the complex unit from JD GAYRARD mai 95 } { inpired from the complex unit from JD GAYRARD mai 95 }

7
rtl/objpas/classes/classesh.inc
View File

@ -15,17 +15,12 @@
{$H+} {$H+}
{$IFDEF VER2_0}
// Sanity check
{$UNDEF FPC_TESTGENERICS}
{$ENDIF}
{$ifdef CLASSESINLINE}{$inline on}{$endif} {$ifdef CLASSESINLINE}{$inline on}{$endif}
type type
{ extra types to compile with FPC } { extra types to compile with FPC }
HRSRC = TFPResourceHandle {$ifndef ver2_2} deprecated {$endif}; HRSRC = TFPResourceHandle deprecated;
TComponentName = string; TComponentName = string;
THandle = System.THandle; THandle = System.THandle;

2
rtl/objpas/classes/stringl.inc
View File

@ -920,7 +920,7 @@ end;
{* TStringList *} {* TStringList *}
{****************************************************************************} {****************************************************************************}
{$if defined(VER2_0) or not defined(FPC_TESTGENERICS)} {$if not defined(FPC_TESTGENERICS)}
Procedure TStringList.ExchangeItems(Index1, Index2: Integer); Procedure TStringList.ExchangeItems(Index1, Index2: Integer);

2
rtl/objpas/sysutils/filutilh.inc
View File

@ -23,7 +23,7 @@ Type
{$ifdef unix} {$ifdef unix}
FindHandle : Pointer; FindHandle : Pointer;
Mode : TMode; Mode : TMode;
PathOnly : AnsiString {$ifndef VER2_2} deprecated{$endif}; PathOnly : AnsiString deprecated;
{$else unix} {$else unix}
FindHandle : THandle; FindHandle : THandle;
{$endif unix} {$endif unix}

4
rtl/objpas/sysutils/sysformt.inc
View File

@ -171,11 +171,7 @@ Var ChPos,OldPos,ArgPos,DoArg,Len : SizeInt;
ReadWidth; ReadWidth;
ReadPrec; ReadPrec;
{$ifdef INWIDEFORMAT} {$ifdef INWIDEFORMAT}
{$ifdef VER2_2}
FormatChar:=UpCase(Fmt[ChPos])[1];
{$else VER2_2}
FormatChar:=UpCase(UnicodeChar(Fmt[ChPos])); FormatChar:=UpCase(UnicodeChar(Fmt[ChPos]));
{$endif VER2_2}
if word(FormatChar)>255 then if word(FormatChar)>255 then
ReadFormat:=#255 ReadFormat:=#255
else else