X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FRtsUtils.c;h=69a1450aea0d3ab1b30863beb22dc2815df69329;hb=e09242215a526ff9903235db6ebfb3cc6bc78d16;hp=693531e6c8a2f4d345a659330bd87ddc6a3e61fc;hpb=7457757f193b28b5fe8fee01edbed012c2fda897;p=ghc-hetmet.git

diff --git a/ghc/rts/RtsUtils.c b/ghc/rts/RtsUtils.c
index 693531e..69a1450 100644
--- a/ghc/rts/RtsUtils.c
+++ b/ghc/rts/RtsUtils.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: RtsUtils.c,v 1.26 2002/07/17 09:21:50 simonmar Exp $
+ * $Id: RtsUtils.c,v 1.28 2002/10/05 22:31:04 panne Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -188,7 +188,7 @@ nat stg_strlen(char *s)
    ToDo: put this somewhere sensible.
    -------------------------------------------------------------------------  */
 
-I_ __GenSymCounter = 0;
+static I_ __GenSymCounter = 0;
 
 I_
 genSymZh(void)
@@ -300,21 +300,21 @@ char *
 ullong_format_string(ullong x, char *s, rtsBool with_commas)
 {
     if (x < (ullong)1000) 
-	sprintf(s, "%d", (nat)x);
+	sprintf(s, "%lu", (lnat)x);
     else if (x < (ullong)1000000)
-	sprintf(s, (with_commas) ? "%ld,%3.3ld" : "%ld%3.3ld",
-		(nat)((x)/(ullong)1000),
-		(nat)((x)%(ullong)1000));
+	sprintf(s, (with_commas) ? "%lu,%3.3lu" : "%lu%3.3lu",
+		(lnat)((x)/(ullong)1000),
+		(lnat)((x)%(ullong)1000));
     else if (x < (ullong)1000000000)
-	sprintf(s, (with_commas) ? "%ld,%3.3ld,%3.3ld" :  "%ld%3.3ld%3.3ld",
-		(nat)((x)/(ullong)1000000),
-		(nat)((x)/(ullong)1000%(ullong)1000),
-		(nat)((x)%(ullong)1000));
+	sprintf(s, (with_commas) ? "%lu,%3.3lu,%3.3lu" :  "%lu%3.3lu%3.3lu",
+		(lnat)((x)/(ullong)1000000),
+		(lnat)((x)/(ullong)1000%(ullong)1000),
+		(lnat)((x)%(ullong)1000));
     else
-	sprintf(s, (with_commas) ? "%ld,%3.3ld,%3.3ld,%3.3ld" : "%ld%3.3ld%3.3ld%3.3ld",
-		(nat)((x)/(ullong)1000000000),
-		(nat)((x)/(ullong)1000000%(ullong)1000),
-		(nat)((x)/(ullong)1000%(ullong)1000), 
-		(nat)((x)%(ullong)1000));
+	sprintf(s, (with_commas) ? "%lu,%3.3lu,%3.3lu,%3.3lu" : "%lu%3.3lu%3.3lu%3.3lu",
+		(lnat)((x)/(ullong)1000000000),
+		(lnat)((x)/(ullong)1000000%(ullong)1000),
+		(lnat)((x)/(ullong)1000%(ullong)1000), 
+		(lnat)((x)%(ullong)1000));
     return s;
 }