diff options
Diffstat (limited to 'rtl/inc/wstrings.inc')
-rw-r--r-- | rtl/inc/wstrings.inc | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/rtl/inc/wstrings.inc b/rtl/inc/wstrings.inc index 403b8c9552..1a366db4cd 100644 --- a/rtl/inc/wstrings.inc +++ b/rtl/inc/wstrings.inc @@ -723,7 +723,7 @@ begin end; -Procedure SetString (Out S : WideString; Buf : PWideChar; Len : SizeInt); +Procedure {$ifdef FPC_HAS_CPSTRING}fpc_setstring_widestr_pwidechar{$else}SetString{$endif}(Out S : WideString; Buf : PWideChar; Len : SizeInt); {$ifdef FPC_HAS_CPSTRING} compilerproc; {$endif FPC_HAS_CPSTRING} begin SetLength(S,Len); If (Buf<>Nil) and (Len>0) then @@ -731,7 +731,7 @@ begin end; -Procedure SetString (Out S : WideString; Buf : PChar; Len : SizeInt); +Procedure {$ifdef FPC_HAS_CPSTRING}fpc_setstring_widestr_pansichar{$else}SetString{$endif}(Out S : WideString; Buf : PChar; Len : SizeInt); {$ifdef FPC_HAS_CPSTRING} compilerproc; {$endif FPC_HAS_CPSTRING} begin If (Buf<>Nil) and (Len>0) then widestringmanager.Ansi2WideMoveProc(Buf,DefaultSystemCodePage,S,Len) @@ -942,38 +942,4 @@ function UTF8Encode(const s : WideString) : RawByteString; end; end; -procedure unimplementedunicodestring; forward; -{$warnings off} -function GenericWideCase(const s : WideString) : WideString; - begin - unimplementedunicodestring; - end; - - -function CompareWideString(const s1, s2 : WideString) : PtrInt; - begin - unimplementedunicodestring; - end; - - -function CompareTextWideString(const s1, s2 : WideString): PtrInt; - begin - unimplementedunicodestring; - end; - -{$warnings on} - - -procedure initwidestringmanager; - begin - fillchar(widestringmanager,sizeof(widestringmanager),0); -{$ifndef HAS_WIDESTRINGMANAGER} - widestringmanager.Wide2AnsiMoveProc:=@DefaultUnicode2AnsiMove; - widestringmanager.Ansi2WideMoveProc:=@DefaultAnsi2WideMove; - widestringmanager.UpperWideStringProc:=@GenericWideCase; - widestringmanager.LowerWideStringProc:=@GenericWideCase; -{$endif HAS_WIDESTRINGMANAGER} - widestringmanager.CompareWideStringProc:=@CompareWideString; - widestringmanager.CompareTextWideStringProc:=@CompareTextWideString; - end; |