[MLton-commit] r5709

[Matthew Fluet]

Fix type mismatches.
----------------------------------------------------------------------

U   mlton/trunk/include/c-chunk.h
U   mlton/trunk/include/c-common.h
U   mlton/trunk/include/c-main.h

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

Modified: mlton/trunk/include/c-chunk.h
===================================================================
--- mlton/trunk/include/c-chunk.h	2007-07-02 00:23:24 UTC (rev 5708)
+++ mlton/trunk/include/c-chunk.h	2007-07-02 03:28:03 UTC (rev 5709)
@@ -100,14 +100,14 @@
         DeclareChunk(n) {                                       \
                 struct cont cont;                               \
                 register unsigned int frontier asm("g5");       \
-                int l_nextFun = nextFun;                        \
+                uintptr_t l_nextFun = nextFun;                  \
                 register unsigned int stackTop asm("g6");
 #else
 #define Chunk(n)                                \
         DeclareChunk(n) {                       \
                 struct cont cont;               \
                 Pointer frontier;               \
-                int l_nextFun = nextFun;        \
+                uintptr_t l_nextFun = nextFun;  \
                 Pointer stackTop;
 #endif
 

Modified: mlton/trunk/include/c-common.h
===================================================================
--- mlton/trunk/include/c-common.h	2007-07-02 00:23:24 UTC (rev 5708)
+++ mlton/trunk/include/c-common.h	2007-07-02 03:28:03 UTC (rev 5709)
@@ -17,7 +17,7 @@
         void *nextChunk;
 };
 
-extern int nextFun;
+extern uintptr_t nextFun;
 extern int returnToC;
 extern struct cont (*nextChunks []) (void);
 extern struct GC_state gcState;

Modified: mlton/trunk/include/c-main.h
===================================================================
--- mlton/trunk/include/c-main.h	2007-07-02 00:23:24 UTC (rev 5708)
+++ mlton/trunk/include/c-main.h	2007-07-02 03:28:03 UTC (rev 5709)
@@ -18,7 +18,7 @@
 
 #define Main(al, mg, mfs, mmc, pk, ps, mc, ml)                          \
 /* Globals */                                                           \
-int nextFun;                                                            \
+uintptr_t nextFun;                                                      \
 int returnToC;                                                          \
 void MLton_callFromC () {                                               \
         struct cont cont;                                               \