[MLton-commit] r4689

[Stephen W. <sw...@ml...>]

Improved typedef for GC_{card,cross}MapStart.

----------------------------------------------------------------------

U   mlton/branches/on-20050822-x86_64-branch/runtime/gc/generational.h
U   mlton/branches/on-20050822-x86_64-branch/runtime/gc/int-inf.c

----------------------------------------------------------------------

Modified: mlton/branches/on-20050822-x86_64-branch/runtime/gc/generational.h
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/gc/generational.h	2006-07-18 01:33:00 UTC (rev 4688)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/gc/generational.h	2006-07-19 02:50:56 UTC (rev 4689)
@@ -15,8 +15,8 @@
 typedef uint8_t GC_cardMapElem;
 typedef uint8_t GC_crossMapElem;
 
-typedef uint8_t GC_cardMapStart __attribute__ ((aligned (4)));
-typedef uint8_t GC_crossMapStart __attribute__ ((aligned (4)));
+typedef GC_cardMapElem GC_cardMapStart __attribute__ ((aligned (4)));
+typedef GC_crossMapElem GC_crossMapStart __attribute__ ((aligned (4)));
 typedef GC_cardMapStart *GC_cardMap;
 typedef GC_crossMapStart *GC_crossMap;
 

Modified: mlton/branches/on-20050822-x86_64-branch/runtime/gc/int-inf.c
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/gc/int-inf.c	2006-07-18 01:33:00 UTC (rev 4688)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/gc/int-inf.c	2006-07-19 02:50:56 UTC (rev 4689)
@@ -347,7 +347,7 @@
   fillIntInfArg (&gcState, arg, &argmpz, argspace);
   sp = (GC_string8)gcState.frontier;
   str = mpz_get_str((void*)&sp->chars, base, &argmpz);
-  assert (str == &sp->chars);
+  assert (str == (char*)&sp->chars);
   size = strlen(str);
   if (sp->chars.c[0] == '-')
     sp->chars.c[0] = '~';