From 0b6ef7f14e5b67da6903d96fe02e81a50eca8daf Mon Sep 17 00:00:00 2001 From: michael Date: Tue, 7 Jun 2005 20:43:18 +0000 Subject: [PATCH] + Merged revision 241 git-svn-id: branches/fixes_2_0@243 - --- rtl/beos/system.pp | 2 -- rtl/bsd/system.pp | 2 -- rtl/go32v2/system.pp | 2 -- rtl/inc/compproc.inc | 6 ------ rtl/inc/generic.inc | 2 -- rtl/inc/rtti.inc | 6 ------ rtl/inc/system.inc | 2 -- rtl/inc/systemh.inc | 10 ---------- rtl/inc/text.inc | 4 ---- rtl/linux/system.pp | 2 -- rtl/macos/system.pp | 2 -- rtl/morphos/system.pp | 2 -- rtl/netware/system.pp | 2 -- rtl/netwlibc/system.pp | 2 -- rtl/objpas/sysutils/sysstr.inc | 2 -- rtl/objpas/typinfo.pp | 8 -------- rtl/solaris/system.pp | 2 -- rtl/unix/cwstring.pp | 4 ---- rtl/watcom/system.pp | 2 -- rtl/win32/system.pp | 4 ---- rtl/win32/sysutils.pp | 4 ---- 21 files changed, 72 deletions(-) diff --git a/rtl/beos/system.pp b/rtl/beos/system.pp index 6f34d69f0c..a76287c961 100644 --- a/rtl/beos/system.pp +++ b/rtl/beos/system.pp @@ -542,7 +542,5 @@ begin {$ifdef HASVARIANT} initvariantmanager; {$endif HASVARIANT} -{$ifdef HASWIDESTRING} initwidestringmanager; -{$endif HASWIDESTRING} end. diff --git a/rtl/bsd/system.pp b/rtl/bsd/system.pp index ad9a801200..bf0ae742e0 100644 --- a/rtl/bsd/system.pp +++ b/rtl/bsd/system.pp @@ -257,7 +257,5 @@ Begin {$ifdef HASVARIANT} initvariantmanager; {$endif HASVARIANT} -{$ifdef HASWIDESTRING} initwidestringmanager; -{$endif HASWIDESTRING} End. diff --git a/rtl/go32v2/system.pp b/rtl/go32v2/system.pp index 620d7ff69c..716ebc4e47 100644 --- a/rtl/go32v2/system.pp +++ b/rtl/go32v2/system.pp @@ -651,7 +651,5 @@ Begin {$ifdef HASVARIANT} initvariantmanager; {$endif HASVARIANT} -{$ifdef HASWIDESTRING} initwidestringmanager; -{$endif HASWIDESTRING} End. diff --git a/rtl/inc/compproc.inc b/rtl/inc/compproc.inc index 4e199a10b4..a8db496484 100644 --- a/rtl/inc/compproc.inc +++ b/rtl/inc/compproc.inc @@ -177,11 +177,9 @@ Procedure fpc_WideStr_CheckRange(len,index : SizeInt); compilerproc; Procedure fpc_WideStr_SetLength (Var S : WideString; l : SizeInt); compilerproc; function fpc_widestr_Unique(Var S : Pointer): Pointer; compilerproc; -{$ifdef HASWIDECHAR} Function fpc_PWideChar_To_AnsiStr(const p : pwidechar): ansistring; compilerproc; Function fpc_PWideChar_To_WideStr(const p : pwidechar): widestring; compilerproc; Function fpc_PWideChar_To_ShortStr(const p : pwidechar): shortstring; compilerproc; -{$endif HASWIDECHAR} { from text.inc } Function fpc_get_input:PText;{$ifdef hascompilerproc}compilerproc;{$endif} @@ -192,9 +190,7 @@ Procedure fpc_Write_Text_ShortStr(Len : Longint;var f : Text;const s : String); Procedure fpc_Write_Text_Pchar_as_Array(Len : Longint;var f : Text;const s : array of char); compilerproc; Procedure fpc_Write_Text_PChar_As_Pointer(Len : Longint;var f : Text;p : PChar); compilerproc; Procedure fpc_Write_Text_AnsiStr (Len : Longint; Var f : Text; S : AnsiString); compilerproc; -{$ifdef HASWIDESTRING} Procedure fpc_Write_Text_WideStr (Len : Longint; Var f : Text; S : WideString); compilerproc; -{$endif HASWIDESTRING} Procedure fpc_Write_Text_SInt(Len : Longint;var t : Text;l : ValSInt); compilerproc; Procedure fpc_Write_Text_UInt(Len : Longint;var t : Text;l : ValUInt); compilerproc; {$ifndef CPU64} @@ -204,9 +200,7 @@ procedure fpc_write_text_int64(len : longint;var t : text;i : int64); compilerpr Procedure fpc_Write_Text_Float(rt,fixkomma,Len : Longint;var t : Text;r : ValReal); compilerproc; Procedure fpc_Write_Text_Boolean(Len : Longint;var t : Text;b : Boolean); compilerproc; Procedure fpc_Write_Text_Char(Len : Longint;var t : Text;c : Char); compilerproc; -{$ifdef HASWIDECHAR} Procedure fpc_Write_Text_WideChar(Len : Longint;var t : Text;c : WideChar); compilerproc; -{$endif HASWIDECHAR} {$ifdef HASVARIANT} procedure fpc_variant_copy(d,s : pointer);compilerproc; diff --git a/rtl/inc/generic.inc b/rtl/inc/generic.inc index 3c04bd6834..71f70aa564 100644 --- a/rtl/inc/generic.inc +++ b/rtl/inc/generic.inc @@ -762,7 +762,6 @@ end; {$endif ndef FPC_SYSTEM_HAS_FPC_PCHAR_LENGTH} -{$ifdef HASWIDESTRING} {$ifndef FPC_SYSTEM_HAS_FPC_PWIDECHAR_LENGTH} function fpc_pwidechar_length(p:pwidechar):longint;[public,alias:'FPC_PWIDECHAR_LENGTH']; {$ifdef hascompilerproc} compilerproc; {$endif} @@ -774,7 +773,6 @@ begin end; {$endif ndef FPC_SYSTEM_HAS_FPC_PWIDECHAR_LENGTH} -{$endif HASWIDESTRING} {**************************************************************************** Caller/StackFrame Helpers diff --git a/rtl/inc/rtti.inc b/rtl/inc/rtti.inc index df4016ccba..4f8a415c19 100644 --- a/rtl/inc/rtti.inc +++ b/rtl/inc/rtti.inc @@ -152,13 +152,11 @@ begin fpc_AnsiStr_Decr_Ref(PPointer(Data)^); PPointer(Data)^:=nil; end; -{$ifdef HASWIDESTRING} tkWstring : begin fpc_WideStr_Decr_Ref(PPointer(Data)^); PPointer(Data)^:=nil; end; -{$endif HASWIDESTRING} tkArray : arrayrtti(data,typeinfo,@int_finalize); tkObject, @@ -184,10 +182,8 @@ begin case PByte(TypeInfo)^ of tkAstring : fpc_AnsiStr_Incr_Ref(PPointer(Data)^); -{$ifdef HASWIDESTRING} tkWstring : fpc_WideStr_Incr_Ref(PPointer(Data)^); -{$endif HASWIDESTRING} tkArray : arrayrtti(data,typeinfo,@int_addref); tkobject, @@ -215,10 +211,8 @@ begin { see AddRef for comment about below construct (JM) } tkAstring: fpc_AnsiStr_Decr_Ref(PPointer(Data)^); -{$ifdef HASWIDESTRING} tkWstring: fpc_WideStr_Decr_Ref(PPointer(Data)^); -{$endif HASWIDESTRING} tkArray: arrayrtti(data,typeinfo,@fpc_systemDecRef); tkobject, diff --git a/rtl/inc/system.inc b/rtl/inc/system.inc index e66ed95da0..90eca003d3 100644 --- a/rtl/inc/system.inc +++ b/rtl/inc/system.inc @@ -259,9 +259,7 @@ end; {Requires int64.inc, since that contains the VAL functions for int64 and qword} {$i astrings.inc} -{$ifdef HASWIDESTRING} {$i wstrings.inc} -{$endif HASWIDESTRING} {$i aliases.inc} diff --git a/rtl/inc/systemh.inc b/rtl/inc/systemh.inc index 0154f77896..87d4e01075 100644 --- a/rtl/inc/systemh.inc +++ b/rtl/inc/systemh.inc @@ -267,20 +267,12 @@ Type POleVariant = ^OleVariant; {$endif HASVARIANT} -{$ifdef HASWIDECHAR} PWideChar = ^WideChar; PPWideChar = ^PWideChar; - { 1.0.x also has HASWIDECHAR defined, but doesn't support it - fully, setting WChar to Word as fallback (PFV) } WChar = Widechar; UCS2Char = WideChar; PUCS2Char = PWideChar; -{$else} - WChar = Word; -{$endif HASWIDECHAR} -{$ifdef HASWIDESTRING} PWideString = ^WideString; -{$endif HASWIDESTRING} { Needed for fpc_get_output } PText = ^Text; @@ -551,9 +543,7 @@ function lowercase(const s : ansistring) : ansistring; WideString Handling ****************************************************************************} -{$ifdef HASWIDESTRING} {$i wstringh.inc} -{$endif HASWIDESTRING} {**************************************************************************** diff --git a/rtl/inc/text.inc b/rtl/inc/text.inc index 9469cab63f..4894608a9a 100644 --- a/rtl/inc/text.inc +++ b/rtl/inc/text.inc @@ -608,7 +608,6 @@ begin end; -{$ifdef HASWIDESTRING} Procedure fpc_Write_Text_WideStr (Len : Longint; Var f : Text; S : WideString); iocheck; [Public,alias:'FPC_WRITE_TEXT_WIDESTR']; {$ifdef hascompilerproc} compilerproc; {$endif} { Writes a WideString to the Text file T @@ -630,7 +629,6 @@ begin else InOutRes:=103; end; end; -{$endif HASWIDESTRING} Procedure fpc_Write_Text_SInt(Len : Longint;var t : Text;l : ValSInt); iocheck; [Public,Alias:'FPC_WRITE_TEXT_SINT']; {$ifdef hascompilerproc} compilerproc; {$endif} var @@ -722,7 +720,6 @@ Begin End; -{$ifdef HASWIDECHAR} Procedure fpc_Write_Text_WideChar(Len : Longint;var t : Text;c : WideChar); iocheck; [Public,Alias:'FPC_WRITE_TEXT_WIDECHAR']; {$ifdef hascompilerproc} compilerproc; {$endif} var ch : char; @@ -745,7 +742,6 @@ Begin TextRec(t).Bufptr^[TextRec(t).BufPos]:=ch; Inc(TextRec(t).BufPos); End; -{$endif HASWIDECHAR} {***************************************************************************** diff --git a/rtl/linux/system.pp b/rtl/linux/system.pp index 471f462176..0803106bcb 100644 --- a/rtl/linux/system.pp +++ b/rtl/linux/system.pp @@ -246,7 +246,5 @@ Begin {$ifdef HASVARIANT} initvariantmanager; {$endif HASVARIANT} -{$ifdef HASWIDESTRING} initwidestringmanager; -{$endif HASWIDESTRING} End. diff --git a/rtl/macos/system.pp b/rtl/macos/system.pp index f09934a5a6..c54b30650f 100644 --- a/rtl/macos/system.pp +++ b/rtl/macos/system.pp @@ -545,9 +545,7 @@ begin {$ifdef HASVARIANT} initvariantmanager; {$endif HASVARIANT} -{$ifdef HASWIDESTRING} initwidestringmanager; -{$endif HASWIDESTRING} if StandAlone = 0 then begin diff --git a/rtl/morphos/system.pp b/rtl/morphos/system.pp index 23bde9bbf2..548d2ace66 100644 --- a/rtl/morphos/system.pp +++ b/rtl/morphos/system.pp @@ -328,7 +328,5 @@ begin {$ifdef HASVARIANT} initvariantmanager; {$endif HASVARIANT} -{$ifdef HASWIDESTRING} initwidestringmanager; -{$endif HASWIDESTRING} end. diff --git a/rtl/netware/system.pp b/rtl/netware/system.pp index de5723fda5..dbe224cfe2 100644 --- a/rtl/netware/system.pp +++ b/rtl/netware/system.pp @@ -482,7 +482,5 @@ Begin {$ifdef HASVARIANT} initvariantmanager; {$endif HASVARIANT} -{$ifdef HASWIDESTRING} initwidestringmanager; -{$endif HASWIDESTRING} End. diff --git a/rtl/netwlibc/system.pp b/rtl/netwlibc/system.pp index c17133e363..17e16eefa8 100644 --- a/rtl/netwlibc/system.pp +++ b/rtl/netwlibc/system.pp @@ -553,7 +553,5 @@ Begin {$ifdef HASVARIANT} initvariantmanager; {$endif HASVARIANT} -{$ifdef HASWIDESTRING} initwidestringmanager; -{$endif HASWIDESTRING} End. diff --git a/rtl/objpas/sysutils/sysstr.inc b/rtl/objpas/sysutils/sysstr.inc index 27d7f23b46..50d6971805 100644 --- a/rtl/objpas/sysutils/sysstr.inc +++ b/rtl/objpas/sysutils/sysstr.inc @@ -1915,9 +1915,7 @@ end; Function StrCharLength(const Str: PChar): Integer; begin -{$ifdef HASWIDESTRING} result:=widestringmanager.CharLengthPCharProc(Str); -{$endif HASWIDESTRING} end; diff --git a/rtl/objpas/typinfo.pp b/rtl/objpas/typinfo.pp index 16d4f3cc82..f9e2a77a5a 100644 --- a/rtl/objpas/typinfo.pp +++ b/rtl/objpas/typinfo.pp @@ -226,12 +226,10 @@ Function GetStrProp(Instance: TObject; const PropName: string): string; Procedure SetStrProp(Instance: TObject; const PropName: string; const Value: AnsiString); Procedure SetStrProp(Instance: TObject; PropInfo : PPropInfo; const Value : Ansistring); -{$ifdef HASWIDESTRING} Function GetWideStrProp(Instance: TObject; PropInfo: PPropInfo): WideString; Function GetWideStrProp(Instance: TObject; const PropName: string): WideString; Procedure SetWideStrProp(Instance: TObject; const PropName: string; const Value: WideString); Procedure SetWideStrProp(Instance: TObject; PropInfo: PPropInfo; const Value: WideString); -{$endif HASWIDESTRING} Function GetFloatProp(Instance: TObject; PropInfo : PPropInfo) : Extended; Function GetFloatProp(Instance: TObject; const PropName: string): Extended; @@ -1005,10 +1003,8 @@ var begin Result:=''; case Propinfo^.PropType^.Kind of -{$ifdef HASWIDESTRING} tkWString: Result:=GetWideStrProp(Instance,PropInfo); -{$endif HASWIDESTRING} tkSString: begin case (PropInfo^.PropProcs) and 3 of @@ -1063,10 +1059,8 @@ var AMethod : TMethod; begin case Propinfo^.PropType^.Kind of -{$ifdef HASWIDESTRING} tkWString: SetWideStrProp(Instance,PropInfo,Value); -{$endif HASWIDESTRING} tkSString: begin case (PropInfo^.PropProcs shr 2) and 3 of @@ -1123,7 +1117,6 @@ begin end; -{$ifdef HASWIDESTRING} Function GetWideStrProp(Instance: TObject; const PropName: string): WideString; begin Result:=GetWideStrProp(Instance, FindPropInfo(Instance, PropName)); @@ -1204,7 +1197,6 @@ begin end; end; -{$endif HASWIDESTRING} { --------------------------------------------------------------------- diff --git a/rtl/solaris/system.pp b/rtl/solaris/system.pp index 4ff4feb99d..930f6a4665 100644 --- a/rtl/solaris/system.pp +++ b/rtl/solaris/system.pp @@ -227,7 +227,5 @@ Begin {$ifdef HASVARIANT} initvariantmanager; {$endif HASVARIANT} -{$ifdef HASWIDESTRING} initwidestringmanager; -{$endif HASWIDESTRING} End. diff --git a/rtl/unix/cwstring.pp b/rtl/unix/cwstring.pp index 0ac8072cb8..17e21b8ead 100644 --- a/rtl/unix/cwstring.pp +++ b/rtl/unix/cwstring.pp @@ -19,13 +19,10 @@ unit cwstring; interface -{$ifdef HASWIDESTRING} procedure SetCWidestringManager; -{$endif HASWIDESTRING} implementation -{$ifdef HASWIDESTRING} {$linklib c} Uses @@ -244,4 +241,3 @@ initialization finalization iconv_close(iconv_ansi2wide); end. -{$endif HASWIDESTRING} diff --git a/rtl/watcom/system.pp b/rtl/watcom/system.pp index f422901e84..f390dfadcc 100644 --- a/rtl/watcom/system.pp +++ b/rtl/watcom/system.pp @@ -1532,7 +1532,5 @@ Begin {$ifdef HASVARIANT} initvariantmanager; {$endif HASVARIANT} -{$ifdef HASWIDESTRING} initwidestringmanager; -{$endif HASWIDESTRING} End. diff --git a/rtl/win32/system.pp b/rtl/win32/system.pp index c9d9fe5d55..ac7bfdd205 100644 --- a/rtl/win32/system.pp +++ b/rtl/win32/system.pp @@ -910,7 +910,6 @@ end; {$endif Set_i386_Exception_handler} -{$ifdef HASWIDESTRING} {**************************************************************************** OS dependend widestrings ****************************************************************************} @@ -945,7 +944,6 @@ procedure InitWin32Widestrings; widestringmanager.LowerWideStringProc:=@Win32WideLower; end; -{$endif HASWIDESTRING} {**************************************************************************** @@ -1097,8 +1095,6 @@ begin {$ifdef HASVARIANT} initvariantmanager; {$endif HASVARIANT} -{$ifdef HASWIDESTRING} initwidestringmanager; InitWin32Widestrings -{$endif HASWIDESTRING} end. diff --git a/rtl/win32/sysutils.pp b/rtl/win32/sysutils.pp index 2b661fe93d..66e8df7bae 100644 --- a/rtl/win32/sysutils.pp +++ b/rtl/win32/sysutils.pp @@ -995,7 +995,6 @@ end; Target Dependent WideString stuff ****************************************************************************} -{$ifdef HASWIDESTRING} function Win32CompareWideString(const s1, s2 : WideString) : PtrInt; begin @@ -1103,13 +1102,10 @@ procedure InitWin32Widestrings; widestringmanager.CompareTextWideStringProc:=@Win32CompareTextWideString; end; -{$endif HASWIDESTRING} Initialization -{$ifdef HASWIDESTRING} InitWin32Widestrings; -{$endif HASWIDESTRING} InitExceptions; { Initialize exceptions. OS independent } InitInternational; { Initialize internationalization settings } LoadVersionInfo;