From 7cbb2eb379a96407770d26d471ac364bf11a18b6 Mon Sep 17 00:00:00 2001
From: carl <carl@freepascal.org>
Date: Sat, 7 Sep 2002 21:16:45 +0000
Subject: [PATCH]   * cardinal -> longword

---
 rtl/inc/sstrings.inc | 15 ++++++++++-----
 rtl/inc/wstrings.inc |  7 +++++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/rtl/inc/sstrings.inc b/rtl/inc/sstrings.inc
index fbb1e9cc64..17fe6ec3cc 100644
--- a/rtl/inc/sstrings.inc
+++ b/rtl/inc/sstrings.inc
@@ -341,8 +341,11 @@ begin
     s:=space(len-length(s))+s;
 end;
 
-
-procedure fpc_shortstr_cardinal(v : cardinal;len : longint;var s : shortstring);[public,alias:'FPC_SHORTSTR_CARDINAL']; {$ifdef hascompilerproc} compilerproc; {$endif}
+{$ifdef ver1_0}
+procedure fpc_shortstr_cardinal(v : longword;len : longint;var s : shortstring);[public,alias:'FPC_SHORTSTR_CARDINAL']; {$ifdef hascompilerproc} compilerproc; {$endif}
+{$else}
+procedure fpc_shortstr_longword(v : longword;len : longint;var s : shortstring);[public,alias:'FPC_SHORTSTR_LONGWORD']; {$ifdef hascompilerproc} compilerproc; {$endif}
+{$endif}
 begin
   int_str(v,s);
   if length(s)<len then
@@ -380,8 +383,7 @@ begin
   move(ss[1],pchar(@a)^,maxlen);
 end;
 
-
-procedure fpc_chararray_cardinal(v : cardinal;len : longint;var a : array of char);{$ifdef hascompilerproc} compilerproc; {$endif}
+procedure fpc_chararray_longword(v : longword;len : longint;var a : array of char);{$ifdef hascompilerproc} compilerproc; {$endif}
 var
   ss : shortstring;
   maxlen : longint;
@@ -660,7 +662,10 @@ end;
 
 {
   $Log$
-  Revision 1.21  2002-09-07 15:07:46  peter
+  Revision 1.22  2002-09-07 21:19:00  carl
+    * cardinal -> longword
+
+  Revision 1.21  2002/09/07 15:07:46  peter
     * old logs removed and tabs fixed
 
   Revision 1.20  2002/09/02 19:24:41  peter
diff --git a/rtl/inc/wstrings.inc b/rtl/inc/wstrings.inc
index 577996335e..fbd6169f6d 100644
--- a/rtl/inc/wstrings.inc
+++ b/rtl/inc/wstrings.inc
@@ -831,7 +831,7 @@ begin
 end;
 
 
-Procedure fpc_WideStr_Cardinal(C : Cardinal;Len : Longint; Var S : WideString);[Public,Alias : 'FPC_WIDESTR_CARDINAL']; {$ifdef hascompilerproc} compilerproc; {$endif}
+Procedure fpc_WideStr_Longword(C : Longword;Len : Longint; Var S : WideString);[Public,Alias : 'FPC_WIDESTR_CARDINAL']; {$ifdef hascompilerproc} compilerproc; {$endif}
 Var
   SS : ShortString;
 begin
@@ -853,7 +853,10 @@ end;
 
 {
   $Log$
-  Revision 1.19  2002-09-07 15:07:46  peter
+  Revision 1.20  2002-09-07 21:16:45  carl
+    * cardinal -> longword
+
+  Revision 1.19  2002/09/07 15:07:46  peter
     * old logs removed and tabs fixed
 
   Revision 1.18  2002/07/29 21:28:17  florian