diff --git a/rtl/i386/i386.inc b/rtl/i386/i386.inc index cb6083c599..1eb2e0c774 100644 --- a/rtl/i386/i386.inc +++ b/rtl/i386/i386.inc @@ -998,11 +998,7 @@ begin end; -{$ifdef interncopy} procedure fpc_shortstr_assign(len:longint;sstr,dstr:pointer);[public,alias:'FPC_SHORTSTR_ASSIGN']; -{$else} -procedure fpc_shortstr_copy(len:longint;sstr,dstr:pointer);[public,alias:'FPC_SHORTSTR_COPY']; -{$endif} begin asm pushl %eax diff --git a/rtl/inc/astrings.inc b/rtl/inc/astrings.inc index dcbaebffe7..7fcff1b33f 100644 --- a/rtl/inc/astrings.inc +++ b/rtl/inc/astrings.inc @@ -555,11 +555,7 @@ begin move(Str[1],S[ofs+1],length(Str)+1); end; -{$ifdef interncopy} Function Fpc_Ansistr_Copy (Const S : AnsiString; Index,Size : SizeInt) : AnsiString;compilerproc; -{$else} -Function Copy (Const S : AnsiString; Index,Size : SizeInt) : AnsiString; -{$endif} var ResultAddress : Pointer; begin @@ -584,11 +580,7 @@ begin PByte(ResultAddress+Size)^:=0; end; end; -{$ifdef interncopy} Pointer(fpc_ansistr_Copy):=ResultAddress; -{$else} - Pointer(Copy):=ResultAddress; -{$endif} end; diff --git a/rtl/inc/generic.inc b/rtl/inc/generic.inc index 71f70aa564..19ffeb534e 100644 --- a/rtl/inc/generic.inc +++ b/rtl/inc/generic.inc @@ -546,11 +546,7 @@ begin result[0]:=chr(len); end; -{$ifdef interncopy} procedure fpc_shortstr_assign(len:longint;sstr,dstr:pointer);[public,alias:'FPC_SHORTSTR_ASSIGN']; {$ifdef HAS_COMPILER_PROC} compilerproc; {$endif} -{$else} -procedure fpc_shortstr_copy(len:longint;sstr,dstr:pointer);[public,alias:'FPC_SHORTSTR_COPY']; {$ifdef HAS_COMPILER_PROC} compilerproc; {$endif} -{$endif} var slen : byte; type diff --git a/rtl/inc/sstrings.inc b/rtl/inc/sstrings.inc index d40aa37ecb..880b4c6e14 100644 --- a/rtl/inc/sstrings.inc +++ b/rtl/inc/sstrings.inc @@ -22,11 +22,7 @@ begin s[0]:=chr(len); end; -{$ifdef interncopy} function fpc_shortstr_copy(const s : shortstring;index : SizeInt;count : SizeInt): shortstring;compilerproc; -{$else} -function copy(const s : shortstring;index : SizeInt;count : SizeInt): shortstring; -{$endif} begin if count<0 then count:=0; @@ -39,13 +35,8 @@ begin else if count>length(s)-index then count:=length(s)-index; -{$ifdef interncopy} fpc_shortstr_Copy[0]:=chr(Count); Move(s[Index+1],fpc_shortstr_Copy[1],Count); -{$else} - Copy[0]:=chr(Count); - Move(s[Index+1],Copy[1],Count); -{$endif} end; diff --git a/rtl/inc/systemh.inc b/rtl/inc/systemh.inc index 3dbdea29b5..5eeaa77aff 100644 --- a/rtl/inc/systemh.inc +++ b/rtl/inc/systemh.inc @@ -462,9 +462,6 @@ function strpas(p:pchar):shortstring;external name 'FPC_PCHAR_TO_SHORTSTR'; function strlen(p:pchar):longint;external name 'FPC_PCHAR_LENGTH'; { Shortstring functions } -{$ifndef InternCopy} -Function Copy(const s:shortstring;index:SizeInt;count:SizeInt):shortstring; -{$endif interncopy} Procedure Delete(Var s:shortstring;index:SizeInt;count:SizeInt); Procedure Insert(const source:shortstring;Var s:shortstring;index:SizeInt); Procedure Insert(source:Char;Var s:shortstring;index:SizeInt); @@ -491,9 +488,6 @@ Function Chr(b:byte):Char; {$endif} Function upCase(c:Char):Char; Function lowerCase(c:Char):Char; overload; -{$ifndef InternCopy} -function copy(c:char;index : SizeInt;count : SizeInt): shortstring; -{$endif interncopy} function pos(const substr : shortstring;c:char): SizeInt; @@ -502,9 +496,6 @@ function pos(const substr : shortstring;c:char): SizeInt; ****************************************************************************} Procedure UniqueString(Var S : AnsiString);external name 'FPC_ANSISTR_UNIQUE'; -{$ifndef InternCopy} -Function Copy (Const S : AnsiString; Index,Size : SizeInt) : AnsiString; -{$endif interncopy} Function Pos (Const Substr : AnsiString; Const Source : AnsiString) : SizeInt; Function Pos (c : Char; Const s : AnsiString) : SizeInt; Procedure Insert (Const Source : AnsiString; Var S : AnsiString; Index : SizeInt); diff --git a/rtl/inc/wstringh.inc b/rtl/inc/wstringh.inc index 79260618fc..230622550c 100644 --- a/rtl/inc/wstringh.inc +++ b/rtl/inc/wstringh.inc @@ -16,9 +16,6 @@ procedure UniqueString(Var S : WideString);external name 'FPC_WIDESTR_UNIQUE'; -{$ifndef InternCopy} -Function Copy (Const S : WideString; Index,Size : SizeInt) : WideString; -{$endif interncopy} Function Pos (Const Substr : WideString; Const Source : WideString) : SizeInt; Function Pos (c : Char; Const s : WideString) : SizeInt; Function Pos (c : WideChar; Const s : WideString) : SizeInt; diff --git a/rtl/inc/wstrings.inc b/rtl/inc/wstrings.inc index 381a3845c2..04beb070a3 100644 --- a/rtl/inc/wstrings.inc +++ b/rtl/inc/wstrings.inc @@ -855,11 +855,7 @@ begin end; -{$ifdef interncopy} Function Fpc_WideStr_Copy (Const S : WideString; Index,Size : SizeInt) : WideString;compilerproc; -{$else} -Function Copy (Const S : WideString; Index,Size : SizeInt) : WideString; -{$endif} var ResultAddress : Pointer; begin @@ -884,11 +880,7 @@ begin PWideChar(ResultAddress+Size*sizeof(WideChar))^:=#0; end; end; -{$ifdef interncopy} Pointer(fpc_widestr_Copy):=ResultAddress; -{$else} - Pointer(Copy):=ResultAddress; -{$endif} end; diff --git a/rtl/powerpc/powerpc.inc b/rtl/powerpc/powerpc.inc index d767d79e2e..2f9817e2fa 100644 --- a/rtl/powerpc/powerpc.inc +++ b/rtl/powerpc/powerpc.inc @@ -830,11 +830,7 @@ asm end; -{$ifdef interncopy} procedure fpc_shortstr_assign(len:longint;sstr,dstr:pointer);[public,alias:'FPC_SHORTSTR_ASSIGN']; -{$else} -procedure fpc_shortstr_copy(len:longint;sstr,dstr:pointer);[public,alias:'FPC_SHORTSTR_COPY']; -{$endif} assembler; nostackframe; { input: r3: len, r4: sstr, r5: dstr } asm