Fix 'passing arg 1 of GC_apply_to_all_blocks from incompatible type' error

(fix of commit e717f1191)

Issue #460 (bdwgc).

* backgraph.c [MAKE_BACK_GRAPH] (per_object_helper): Add GC_CALLBACK
modifier; change 2nd argument type from word to GC_word.
* checksums.c [CHECKSUMS] (GC_add_block): Likewise.
* dbg_mlc.c [!SHORT_DBG_HDRS] (GC_check_heap_block): Likewise.
* mark.c (clear_marks_for_block): Likewise.
* misc.c (block_add_size): Likewise.
* reclaim.c (GC_reclaim_block, GC_print_block_descr,
GC_do_enumerate_reachable_objects): Likewise.
* checksums.c [CHECKSUMS] (GC_check_blocks): Remove unnecessary cast of
zero to word.
* include/gc/gc_mark.h (GC_apply_to_all_blocks): Add GC_ATTR_NONNULL(1).

1 files changed, 6 insertions, 4 deletions

diff --git a/reclaim.c b/reclaim.c
index 84b1ba11..b847fdaf 100644
--- a/reclaim.c
+++ b/reclaim.c
@@ -385,7 +385,8 @@ STATIC void GC_reclaim_small_nonempty_block(struct hblk *hbp, word sz,
  * If report_if_found is TRUE, then process any block immediately, and
  * simply report free objects; do not actually reclaim them.
  */
-STATIC void GC_reclaim_block(struct hblk *hbp, word report_if_found)
+STATIC void GC_CALLBACK GC_reclaim_block(struct hblk *hbp,
+                                         GC_word report_if_found)
 {
     hdr * hhdr = HDR(hbp);
     word sz;    /* size of objects in current block */
@@ -560,8 +561,8 @@ unsigned GC_n_set_marks(hdr *hhdr)
 
 #endif /* !USE_MARK_BYTES  */
 
-STATIC void GC_print_block_descr(struct hblk *h,
-                                 word /* struct PrintStats */ raw_ps)
+STATIC void GC_CALLBACK GC_print_block_descr(struct hblk *h,
+                                GC_word /* struct PrintStats */ raw_ps)
 {
     hdr *hhdr = HDR(h);
     word sz = hhdr -> hb_sz;
@@ -814,7 +815,8 @@ struct enumerate_reachable_s {
   void *client_data;
 };
 
-STATIC void GC_do_enumerate_reachable_objects(struct hblk *hbp, word ped)
+STATIC void GC_CALLBACK GC_do_enumerate_reachable_objects(struct hblk *hbp,
+                                                          GC_word ped)
 {
   struct hblkhdr *hhdr = HDR(hbp);
   size_t sz = (size_t)hhdr->hb_sz;