From 1ec105d95edf5d2e2ff5ee8383cbf2f5fee600e4 Mon Sep 17 00:00:00 2001
From: marco <marco@freepascal.org>
Date: Sun, 13 Mar 2005 14:30:24 +0000
Subject: [PATCH]  * some 1.0.x fixes

---
 rtl/objpas/sysutils/sysint.inc |  7 ++++++-
 rtl/objpas/sysutils/sysstr.inc | 27 +++++++++++++++++++++++++--
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/rtl/objpas/sysutils/sysint.inc b/rtl/objpas/sysutils/sysint.inc
index fc63d851fb..e60eec8c2c 100644
--- a/rtl/objpas/sysutils/sysint.inc
+++ b/rtl/objpas/sysutils/sysint.inc
@@ -20,6 +20,7 @@ procedure InitInternationalGeneric;
     fillchar(SysLocale,sizeof(SysLocale),0);
     
     { keep these routines out of the executable? }
+{$ifndef VER1_0}
 {$ifndef FPC_NOGENERICANSIROUTINES}
     widestringmanager.UpperAnsiStringProc:=@GenericAnsiUpperCase;
     widestringmanager.LowerAnsiStringProc:=@GenericAnsiLowerCase;    
@@ -32,11 +33,15 @@ procedure InitInternationalGeneric;
     widestringmanager.StrLowerAnsiStringProc:=@GenericAnsiStrLower;
     widestringmanager.StrUpperAnsiStringProc:=@GenericAnsiStrUpper;
 {$endif FPC_NOGENERICANSIROUTINES}    
+{$endif}
   end;
   
 {
   $Log$
-  Revision 1.2  2005-03-12 14:56:22  florian
+  Revision 1.3  2005-03-13 14:30:24  marco
+   * some 1.0.x fixes
+
+  Revision 1.2  2005/03/12 14:56:22  florian
     + added Ansi* routines to widestring manager
     * made them using OS calls on windows
 
diff --git a/rtl/objpas/sysutils/sysstr.inc b/rtl/objpas/sysutils/sysstr.inc
index 3b0e609c5b..935a88de03 100644
--- a/rtl/objpas/sysutils/sysstr.inc
+++ b/rtl/objpas/sysutils/sysstr.inc
@@ -409,61 +409,81 @@ end ;
 
 function AnsiUpperCase(const s: string): string;{$ifdef SYSUTILSINLINE}inline;{$endif}
   begin
+  {$ifndef ver1_0}
     result:=widestringmanager.UpperAnsiStringProc(s);
+  {$endif}
   end;
   
   
 function AnsiLowerCase(const s: string): string;{$ifdef SYSUTILSINLINE}inline;{$endif}
   begin
+  {$ifndef ver1_0}
     result:=widestringmanager.LowerAnsiStringProc(s);
+  {$endif}
   end;
   
   
 function AnsiCompareStr(const S1, S2: string): integer;{$ifdef SYSUTILSINLINE}inline;{$endif}
   begin
+  {$ifndef ver1_0}
     result:=widestringmanager.CompareStrAnsiStringProc(s1,s2);
+  {$endif}
   end;
   
   
 function AnsiCompareText(const S1, S2: string): integer;{$ifdef SYSUTILSINLINE}inline;{$endif}
   begin
+  {$ifndef ver1_0}
     result:=widestringmanager.CompareTextAnsiStringProc(s1,s2);
+  {$endif}
   end;
   
   
 function AnsiStrComp(S1, S2: PChar): integer;{$ifdef SYSUTILSINLINE}inline;{$endif}
   begin
+  {$ifndef ver1_0}
     result:=widestringmanager.StrCompAnsiStringProc(s1,s2);
+  {$endif}
   end;
 
   
 function AnsiStrIComp(S1, S2: PChar): integer;{$ifdef SYSUTILSINLINE}inline;{$endif}
   begin
-    result:=widestringmanager.StrICompAnsiStringProc(s1,s2);
+  {$ifndef ver1_0}
+    result:=widestringmanager.StrICompAnsiStringProc(s1,s2); 
+  {$endif}
   end;
 
   
 function AnsiStrLComp(S1, S2: PChar; MaxLen: cardinal): integer;{$ifdef SYSUTILSINLINE}inline;{$endif}
   begin
+  {$ifndef ver1_0}
     result:=widestringmanager.StrLCompAnsiStringProc(s1,s2,maxlen);
+  {$endif}
   end;
 
   
 function AnsiStrLIComp(S1, S2: PChar; MaxLen: cardinal): integer;{$ifdef SYSUTILSINLINE}inline;{$endif}
   begin
+  {$ifndef ver1_0}
     result:=widestringmanager.StrLICompAnsiStringProc(s1,s2,maxlen);
+  {$endif}
   end;
 
   
 function AnsiStrLower(Str: PChar): PChar;{$ifdef SYSUTILSINLINE}inline;{$endif}
   begin
+  {$ifndef ver1_0}
     result:=widestringmanager.StrLowerAnsiStringProc(Str);
+  {$endif}
   end;
   
   
 function AnsiStrUpper(Str: PChar): PChar;{$ifdef SYSUTILSINLINE}inline;{$endif}
   begin
+  {$ifndef ver1_0}
     result:=widestringmanager.StrUpperAnsiStringProc(Str);
+  {$endif}
   end;
 
 
@@ -2077,7 +2097,10 @@ const
 
 {
   $Log$
-  Revision 1.33  2005-03-12 14:56:22  florian
+  Revision 1.34  2005-03-13 14:30:24  marco
+   * some 1.0.x fixes
+
+  Revision 1.33  2005/03/12 14:56:22  florian
     + added Ansi* routines to widestring manager
     * made them using OS calls on windows