X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FmkDerivedConstants.c;h=e9bff955a82b4414cc928b09c3488383f413afe3;hb=f9288086f935c97812b2d80defcff38baf7b6a6c;hp=116b2e997185a8ded9f1809dcca6363df75bc35c;hpb=176fa33f17dd78355cc572e006d2ab26898e2c69;p=ghc-hetmet.git

diff --git a/includes/mkDerivedConstants.c b/includes/mkDerivedConstants.c
index 116b2e9..e9bff95 100644
--- a/includes/mkDerivedConstants.c
+++ b/includes/mkDerivedConstants.c
@@ -52,7 +52,7 @@
 #define ctype(type) /* nothing */
 #else
 #define ctype(type) \
-    printf("#define SIZEOF_" #type " %d\n", sizeof(type)); 
+    printf("#define SIZEOF_" #type " %lu\n", (unsigned long)sizeof(type));
 #endif
 
 #if defined(GEN_HASKELL)
@@ -67,7 +67,7 @@
 */
 #define field_type_(str, s_type, field) \
     printf("#define REP_" str " b"); \
-    printf("%d\n", sizeof (__typeof__(((((s_type*)0)->field)))) * 8);
+    printf("%lu\n", (unsigned long)sizeof (__typeof__(((((s_type*)0)->field)))) * 8);
 #define field_type_gcptr_(str, s_type, field) \
     printf("#define REP_" str " gcptr\n");
 #endif
@@ -99,17 +99,17 @@
 #if defined(GEN_HASKELL)
 #define def_size(str, size)                \
     printf("sIZEOF_" str " :: Int\n");     \
-    printf("sIZEOF_" str " = %d\n", size);
+    printf("sIZEOF_" str " = %lu\n", (unsigned long)size);
 #else
 #define def_size(str, size) \
-    printf("#define SIZEOF_" str " %d\n", size);
+    printf("#define SIZEOF_" str " %lu\n", (unsigned long)size);
 #endif
 
 #if defined(GEN_HASKELL)
 #define def_closure_size(str, size) /* nothing */
 #else
 #define def_closure_size(str, size) \
-    printf("#define SIZEOF_" str " (SIZEOF_StgHeader+%d)\n", size);
+    printf("#define SIZEOF_" str " (SIZEOF_StgHeader+%lu)\n", (unsigned long)size);
 #endif
 
 #define struct_size(s_type) \
@@ -197,13 +197,13 @@ main(int argc, char *argv[])
 #ifndef GEN_HASKELL
     printf("/* This file is created automatically.  Do not edit by hand.*/\n\n");
 
-    printf("#define STD_HDR_SIZE   %d\n", sizeofW(StgHeader) - sizeofW(StgProfHeader));
+    printf("#define STD_HDR_SIZE   %lu\n", (unsigned long)sizeofW(StgHeader) - sizeofW(StgProfHeader));
     /* grrr.. PROFILING is on so we need to subtract sizeofW(StgProfHeader) */
-    printf("#define PROF_HDR_SIZE  %d\n", sizeofW(StgProfHeader));
-    printf("#define GRAN_HDR_SIZE  %d\n", sizeofW(StgGranHeader));
+    printf("#define PROF_HDR_SIZE  %lu\n", (unsigned long)sizeofW(StgProfHeader));
+    printf("#define GRAN_HDR_SIZE  %lu\n", (unsigned long)sizeofW(StgGranHeader));
 
-    printf("#define BLOCK_SIZE   %d\n", BLOCK_SIZE);
-    printf("#define MBLOCK_SIZE   %d\n", MBLOCK_SIZE);  
+    printf("#define BLOCK_SIZE   %u\n", BLOCK_SIZE);
+    printf("#define MBLOCK_SIZE   %u\n", MBLOCK_SIZE);
 
     printf("\n\n");
 #endif
@@ -376,6 +376,7 @@ main(int argc, char *argv[])
     closure_field(StgWeak,key);
     closure_field(StgWeak,value);
     closure_field(StgWeak,finalizer);
+    closure_field(StgWeak,cfinalizer);
 
     closure_size(StgDeadWeak);
     closure_field(StgDeadWeak,link);