Browse Source

merge r17607 from cpstrnew branch by inoussa:
Updated to take care of the code page : fpc_ansistr_to_chararray, fpc_ansistr_to_widechararray

git-svn-id: trunk@19124 -

paul 14 years ago
parent
commit
5ac95bc27a
3 changed files with 4 additions and 4 deletions
  1. 1 1
      rtl/inc/astrings.inc
  2. 2 2
      rtl/inc/compproc.inc
  3. 1 1
      rtl/inc/ustrings.inc

+ 1 - 1
rtl/inc/astrings.inc

@@ -609,7 +609,7 @@ end;
 
 
 {$else ndef FPC_STRTOCHARARRAYPROC}
 {$else ndef FPC_STRTOCHARARRAYPROC}
 
 
-procedure  fpc_ansistr_to_chararray(out res: array of char; const src: ansistring); compilerproc;
+procedure  fpc_ansistr_to_chararray(out res: array of char; const src: RawByteString); compilerproc;
 var
 var
   len: SizeInt;
   len: SizeInt;
 begin
 begin

+ 2 - 2
rtl/inc/compproc.inc

@@ -277,7 +277,7 @@ Function fpc_CharArray_To_AnsiStr(const arr: array of char; zerobased: boolean =
 {$ifndef FPC_STRTOCHARARRAYPROC}
 {$ifndef FPC_STRTOCHARARRAYPROC}
 function fpc_ansistr_to_chararray(arraysize: SizeInt; const src: ansistring): fpc_big_chararray; compilerproc;
 function fpc_ansistr_to_chararray(arraysize: SizeInt; const src: ansistring): fpc_big_chararray; compilerproc;
 {$else ndef FPC_STRTOCHARARRAYPROC}
 {$else ndef FPC_STRTOCHARARRAYPROC}
-procedure fpc_ansistr_to_chararray(out res: array of char; const src: ansistring)compilerproc;
+procedure fpc_ansistr_to_chararray(out res: array of char; const src: RawByteString)compilerproc;
 {$endif ndef FPC_STRTOCHARARRAYPROC}
 {$endif ndef FPC_STRTOCHARARRAYPROC}
 Function fpc_AnsiStr_Compare(const S1,S2 : RawByteString): SizeInt; compilerproc;
 Function fpc_AnsiStr_Compare(const S1,S2 : RawByteString): SizeInt; compilerproc;
 Function fpc_AnsiStr_Compare_equal(const S1,S2 : RawByteString): SizeInt; compilerproc;
 Function fpc_AnsiStr_Compare_equal(const S1,S2 : RawByteString): SizeInt; compilerproc;
@@ -422,7 +422,7 @@ Function fpc_shortstr_to_widechararray(arraysize: SizeInt; const src: ShortStrin
 Function fpc_ansistr_to_widechararray(arraysize: SizeInt; const src: AnsiString): fpc_big_widechararray; compilerproc;
 Function fpc_ansistr_to_widechararray(arraysize: SizeInt; const src: AnsiString): fpc_big_widechararray; compilerproc;
 {$else ndef FPC_STRTOCHARARRAYPROC}
 {$else ndef FPC_STRTOCHARARRAYPROC}
 procedure fpc_shortstr_to_widechararray(out res: array of widechar; const src: ShortString); compilerproc;
 procedure fpc_shortstr_to_widechararray(out res: array of widechar; const src: ShortString); compilerproc;
-procedure fpc_ansistr_to_widechararray(out res: array of widechar; const src: AnsiString); compilerproc;
+procedure fpc_ansistr_to_widechararray(out res: array of widechar; const src: RawByteString); compilerproc;
 procedure fpc_unicodestr_to_widechararray(out res: array of widechar; const src: UnicodeString); compilerproc;
 procedure fpc_unicodestr_to_widechararray(out res: array of widechar; const src: UnicodeString); compilerproc;
 {$endif ndef FPC_STRTOCHARARRAYPROC}
 {$endif ndef FPC_STRTOCHARARRAYPROC}
 {$endif VER2_2}
 {$endif VER2_2}

+ 1 - 1
rtl/inc/ustrings.inc

@@ -1252,7 +1252,7 @@ begin
 {$endif}
 {$endif}
 end;
 end;
 
 
-procedure fpc_ansistr_to_widechararray(out res: array of widechar; const src: AnsiString); compilerproc;
+procedure fpc_ansistr_to_widechararray(out res: array of widechar; const src: RawByteString); compilerproc;
 var
 var
   len: SizeInt;
   len: SizeInt;
   temp: widestring;
   temp: widestring;