Imported and merged Boehm GC 7.0

[cacao.git] / src / mm / boehm-gc / include / private / dbg_mlc.h

diff --git a/src/mm/boehm-gc/include/private/dbg_mlc.h b/src/mm/boehm-gc/include/private/dbg_mlc.h
index e0a994de5e2a64c1d095cc7e2c3b4d1a2fea9b34..fcd027c4fed97473ea99e7f0bffa15cb60d1c772 100644 (file)
--- a/src/mm/boehm-gc/include/private/dbg_mlc.h
+++ b/src/mm/boehm-gc/include/private/dbg_mlc.h
@@ -38,7 +38,7 @@
   /* get them anyway.                                                  */
     typedef GC_word GC_hidden_pointer;
 #   define HIDE_POINTER(p) (~(GC_hidden_pointer)(p))
-#   define REVEAL_POINTER(p) ((GC_PTR)(HIDE_POINTER(p)))
+#   define REVEAL_POINTER(p) ((void *)(HIDE_POINTER(p)))
 #endif /* HIDE_POINTER */
 
 # define START_FLAG ((word)0xfedcedcb)
@@ -95,12 +95,12 @@ typedef struct {
 #      ifdef MAKE_BACK_GRAPH
          GC_hidden_pointer oh_bg_ptr;
 #      endif
-#      if defined(ALIGN_DOUBLE) && \
-           (defined(KEEP_BACK_PTRS) != defined(MAKE_BACK_GRAPH))
+#      if defined(KEEP_BACK_PTRS) != defined(MAKE_BACK_GRAPH)
+         /* Keep double-pointer-sized alignment.       */
          word oh_dummy;
 #      endif
 #   endif
-    GC_CONST char * oh_string; /* object descriptor string     */
+    const char * oh_string;    /* object descriptor string     */
     word oh_int;               /* object descriptor integers   */
 #   ifdef NEED_CALLINFO
       struct callinfo oh_ci[NFRAMES];
@@ -132,17 +132,20 @@ typedef struct {
 /* lock.                                                       */
 /* PRINT_CALL_CHAIN prints the call chain stored in an object  */
 /* to stderr.  It requires that we do not hold the lock.       */
-#ifdef SAVE_CALL_CHAIN
+#if defined(SAVE_CALL_CHAIN)
+    struct callinfo;
+    void GC_save_callers(struct callinfo info[NFRAMES]);
+    void GC_print_callers(struct callinfo info[NFRAMES]);
 #   define ADD_CALL_CHAIN(base, ra) GC_save_callers(((oh *)(base)) -> oh_ci)
 #   define PRINT_CALL_CHAIN(base) GC_print_callers(((oh *)(base)) -> oh_ci)
-#else
-# ifdef GC_ADD_CALLER
+#elif defined(GC_ADD_CALLER)
+    struct callinfo;
+    void GC_print_callers(struct callinfo info[NFRAMES]);
 #   define ADD_CALL_CHAIN(base, ra) ((oh *)(base)) -> oh_ci[0].ci_pc = (ra)
 #   define PRINT_CALL_CHAIN(base) GC_print_callers(((oh *)(base)) -> oh_ci)
-# else
+#else
 #   define ADD_CALL_CHAIN(base, ra)
 #   define PRINT_CALL_CHAIN(base)
-# endif
 #endif
 
 # ifdef GC_ADD_CALLER