From 741fe89a509e656c0ee568b6c7faee87f5e9990e Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 24 Nov 1998 17:12:42 +0000 Subject: [PATCH] * fixed length(char) - removed obsolete version.inc --- rtl/inc/makefile.inc | 2 +- rtl/inc/systemh.inc | 17 ++--- rtl/inc/version.inc | 158 ------------------------------------------- 3 files changed, 8 insertions(+), 169 deletions(-) delete mode 100644 rtl/inc/version.inc diff --git a/rtl/inc/makefile.inc b/rtl/inc/makefile.inc index 9093af5898..9cc4a641ac 100644 --- a/rtl/inc/makefile.inc +++ b/rtl/inc/makefile.inc @@ -6,7 +6,7 @@ # implementation files. SYSNAMES=systemh heaph mathh filerec textrec system real2str sstrings innr \ - file typefile version text rtti heap astrings + file typefile text rtti heap astrings SYSINCNAMES=$(addsuffix .inc,$(SYSNAMES)) # Other unit names which can be used for all systems diff --git a/rtl/inc/systemh.inc b/rtl/inc/systemh.inc index 497add7e16..8d12c8e0a8 100644 --- a/rtl/inc/systemh.inc +++ b/rtl/inc/systemh.inc @@ -20,12 +20,6 @@ RTLLITE Create a somewhat smaller RTL } -{**************************************************************************** - Support for multiple compiler versions -****************************************************************************} - -{$i version.inc} - {**************************************************************************** Needed switches ****************************************************************************} @@ -162,9 +156,6 @@ Function Swap (X:Cardinal):Cardinal; Function Swap (X:Longint):Longint; {$endif RTLLITE} -Function Chr(b:byte):Char; -Function Length(s:string):byte; - Function Random(l:Longint):Longint; Function Random:real; Procedure Randomize; @@ -202,12 +193,14 @@ Procedure Insert(const source:shortstring;Var s:shortstring;index:StrLenInt); Function Pos(const substr:shortstring;const s:shortstring):StrLenInt; Function Pos(C:Char;const s:shortstring):StrLenInt; Procedure SetLength(var s:shortstring;len:StrLenInt); +Function Length(s:string):byte; { Char functions to overcome overloading problem with ansistrings } function copy(c:char;index : StrLenInt;count : StrLenInt): shortstring; function pos(const substr : shortstring;c:char): StrLenInt; function length(c:char):byte; +Function Chr(b:byte):Char; Function upCase(const s:shortstring):shortstring; Function upCase(c:Char):Char; {$ifndef RTLLITE} @@ -439,7 +432,11 @@ const { $Log$ - Revision 1.41 1998-11-16 10:21:26 peter + Revision 1.42 1998-11-24 17:12:43 peter + * fixed length(char) + - removed obsolete version.inc + + Revision 1.41 1998/11/16 10:21:26 peter * fixes for H+ Revision 1.40 1998/11/05 10:29:37 pierre diff --git a/rtl/inc/version.inc b/rtl/inc/version.inc deleted file mode 100644 index ce2830ad36..0000000000 --- a/rtl/inc/version.inc +++ /dev/null @@ -1,158 +0,0 @@ -{------------------------------------------------------------------------------ - Define VER_ABOVE_xx For easier Version support -------------------------------------------------------------------------------} - -{$IFDEF VER0_99_0} - {$DEFINE VER_ABOVE0_99_0} -{$ENDIF VER0_99_0} - -{$IFDEF VER0_99} - {$DEFINE VER_ABOVE0_99} -{$ENDIF VER0_99} - -{$IFDEF VER0_9_8} - {$DEFINE VER_ABOVE0_9_8} -{$ENDIF VER0_9_8} - -{$IFDEF VER0_9_7} - {$DEFINE VER_ABOVE0_9_7} -{$ENDIF VER0_9_7} - -{$IFDEF VER0_9_6} - {$DEFINE VER_ABOVE0_9_6} -{$ENDIF VER0_9_6} - -{$IFDEF VER0_9_5} - {$DEFINE VER_ABOVE0_9_5} -{$ENDIF VER0_9_5} - -{$IFDEF VER0_9_4} - {$DEFINE VER_ABOVE0_9_4} -{$ENDIF VER0_9_4} - -{$IFDEF VER0_9_3} - {$DEFINE VER_ABOVE0_9_3} -{$ENDIF VER0_9_3} - -{$IFDEF VER0_9_2} - {$DEFINE VER_ABOVE0_9_2} -{$ENDIF VER0_9_2} - -{$IFDEF VER0_9_1} - {$DEFINE VER_ABOVE0_9_1} -{$ENDIF VER0_9_1} - -{$IFDEF VER0_9} - {$DEFINE VER_ABOVE0_9} -{$ENDIF VER0_9} - -{$IFDEF VER0_6_6} - {$DEFINE VER_ABOVE0_6_6} -{$ENDIF VER0_6_6} - -{$IFDEF VER0_6_5} - {$DEFINE VER_ABOVE0_6_5} -{$ENDIF VER0_6_5} - -{$IFDEF VER0_6_4} - {$DEFINE VER_ABOVE0_6_4} -{$ENDIF VER0_6_4} - -{$IFDEF VER0_6_3} - {$DEFINE VER_ABOVE0_6_3} -{$ENDIF VER0_6_3} - -{$IFDEF VER0_6_2} - {$DEFINE VER_ABOVE0_6_2} -{$ENDIF VER0_6_2} - -{$IFDEF VER0_6_1} - {$DEFINE VER_ABOVE0_6_1} -{$ENDIF VER0_6_1} - -{$IFDEF VER0_6} - {$DEFINE VER_ABOVE0_6} -{$ENDIF VER0_6} - -{------------------------------------------------------------------------------ - Higher versions always include lower versions, so define them also -------------------------------------------------------------------------------} - -{$IFDEF VER_ABOVE0_99_0} - {$DEFINE VER_ABOVE0_99} -{$ENDIF VER_ABOVE0_99_0} - -{$IFDEF VER_ABOVE0_99} - {$DEFINE VER_ABOVE0_9_8} -{$ENDIF VER_ABOVE0_99} - -{$IFDEF VER_ABOVE0_9_8} - {$DEFINE VER_ABOVE0_9_7} -{$ENDIF VER_ABOVE0_9_8} - -{$IFDEF VER_ABOVE0_9_7} - {$DEFINE VER_ABOVE0_9_6} -{$ENDIF VER_ABOVE0_9_7} - -{$IFDEF VER_ABOVE0_9_6} - {$DEFINE VER_ABOVE0_9_5} -{$ENDIF VER_ABOVE0_9_6} - -{$IFDEF VER_ABOVE0_9_5} - {$DEFINE VER_ABOVE0_9_4} -{$ENDIF VER_ABOVE0_9_5} - -{$IFDEF VER_ABOVE0_9_4} - {$DEFINE VER_ABOVE0_9_3} -{$ENDIF VER_ABOVE0_9_4} - -{$IFDEF VER_ABOVE0_9_3} - {$DEFINE VER_ABOVE0_9_2} -{$ENDIF VER_ABOVE0_9_3} - -{$IFDEF VER_ABOVE0_9_2} - {$DEFINE VER_ABOVE0_9_1} -{$ENDIF VER_ABOVE0_9_2} - -{$IFDEF VER_ABOVE0_9_1} - {$DEFINE VER_ABOVE0_9} -{$ENDIF VER_ABOVE0_9_1} - -{$IFDEF VER_ABOVE0_9} - {$DEFINE VER_ABOVE0_6_6} -{$ENDIF VER_ABOVE0_9} - -{$IFDEF VER_ABOVE0_6_6} - {$DEFINE VER_ABOVE0_6_5} -{$ENDIF VER_ABOVE0_6_6} - -{$IFDEF VER_ABOVE0_6_5} - {$DEFINE VER_ABOVE0_6_4} -{$ENDIF VER_ABOVE0_6_5} - -{$IFDEF VER_ABOVE0_6_4} - {$DEFINE VER_ABOVE0_6_3} -{$ENDIF VER_ABOVE0_6_4} - -{$IFDEF VER_ABOVE0_6_3} - {$DEFINE VER_ABOVE0_6_2} -{$ENDIF VER_ABOVE0_6_3} - -{$IFDEF VER_ABOVE0_6_2} - {$DEFINE VER_ABOVE0_6_1} -{$ENDIF VER_ABOVE0_6_2} - -{$IFDEF VER_ABOVE0_6_1} - {$DEFINE VER_ABOVE0_6} -{$ENDIF VER_ABOVE0_6_1} - - -{ - $Log$ - Revision 1.2 1998-05-12 10:42:46 peter - * moved getopts to inc/, all supported OS's need argc,argv exported - + strpas, strlen are now exported in the systemunit - * removed logs - * removed $ifdef ver_above - -}