2009-10-17 Ivan Maidanski <ivmai@mail.ru>

	* include/private/gc_priv.h (I_HIDE_POINTERS): Define before gc.h
	inclusion.
	* include/private/gc_pmark.h (I_HIDE_POINTERS): Define if gc.h is
	not included yet.
	* finalize.c (I_HIDE_POINTERS): Don't define.
	* include/private/dbg_mlc.h (I_HIDE_POINTERS): Ditto.
	* misc.c (I_HIDE_POINTERS): Ditto.
	* include/private/dbg_mlc.h (HIDE_POINTER, REVEAL_POINTER,
	GC_hidden_pointer): Don't define if HIDE_POINTER is undefined.
	* include/private/gc_pmark.h: Remove the comment about gc_priv.h
	inclusion order.

diff --git a/ChangeLog b/ChangeLog
index d0207071356be22cb91e47d7c2c94e790183cb84..f659251a6c41187a8ab9a6c492fb854b7dde0704 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-10-17  Ivan Maidanski <ivmai@mail.ru>
+
+       * include/private/gc_priv.h (I_HIDE_POINTERS): Define before gc.h
+       inclusion.
+       * include/private/gc_pmark.h (I_HIDE_POINTERS): Define if gc.h is
+       not included yet.
+       * finalize.c (I_HIDE_POINTERS): Don't define.
+       * include/private/dbg_mlc.h (I_HIDE_POINTERS): Ditto.
+       * misc.c (I_HIDE_POINTERS): Ditto.
+       * include/private/dbg_mlc.h (HIDE_POINTER, REVEAL_POINTER,
+       GC_hidden_pointer): Don't define if HIDE_POINTER is undefined.
+       * include/private/gc_pmark.h: Remove the comment about gc_priv.h
+       inclusion order.
+
 2009-10-17  Ivan Maidanski <ivmai@mail.ru>
 
        * dyn_load.c: Include gc_priv.h before using configuration

diff --git a/finalize.c b/finalize.c
index aca3709d2972d7594328eb09465c260a430b6220..ceedad1c7ff49f254b40ed5bd191bb3a055322ef 100644 (file)
--- a/finalize.c
+++ b/finalize.c
@@ -14,8 +14,8 @@
  * modified is included with the above copyright notice.
  */
 /* Boehm, February 1, 1996 1:19 pm PST */
-# define I_HIDE_POINTERS
-# include "private/gc_pmark.h"
+
+#include "private/gc_pmark.h"
 
 # ifdef FINALIZE_ON_DEMAND
     int GC_finalize_on_demand = 1;

diff --git a/include/private/dbg_mlc.h b/include/private/dbg_mlc.h
index aa652dedd7f628d81a6588dbd9223f4681f8c262..684ec3f64572bdf7bb1b406a5bee449a4668e443 100644 (file)
--- a/include/private/dbg_mlc.h
+++ b/include/private/dbg_mlc.h
@@ -23,24 +23,13 @@
  */
 
 #ifndef _DBG_MLC_H
-
 #define _DBG_MLC_H
 
-# define I_HIDE_POINTERS
 # include "gc_priv.h"
 # ifdef KEEP_BACK_PTRS
 #   include "gc_backptr.h"
 # endif
 
-#ifndef HIDE_POINTER
-  /* Gc.h was previously included, and hence the I_HIDE_POINTERS        */
-  /* definition had no effect.  Repeat the gc.h definitions here to     */
-  /* get them anyway.                                                   */
-    typedef GC_word GC_hidden_pointer;
-#   define HIDE_POINTER(p) (~(GC_hidden_pointer)(p))
-#   define REVEAL_POINTER(p) ((void *)(HIDE_POINTER(p)))
-#endif /* HIDE_POINTER */
-
 # define START_FLAG ((word)0xfedcedcb)
 # define END_FLAG ((word)0xbcdecdef)
         /* Stored both one past the end of user object, and one before  */

diff --git a/include/private/gc_pmark.h b/include/private/gc_pmark.h
index 31b5340fedc05b728929beac434195719a472460..bad456b422d53a345c3d53c8dceece6ed360a615 100644 (file)
--- a/include/private/gc_pmark.h
+++ b/include/private/gc_pmark.h
@@ -18,9 +18,6 @@
 /*
  * Declarations of mark stack.  Needed by marker and client supplied mark
  * routines.  Transitively include gc_priv.h.
- * (Note that gc_priv.h should not be included before this, since this
- * includes dbg_mlc.h, which wants to include gc_priv.h AFTER defining
- * I_HIDE_POINTERS.)
  */
 #ifndef GC_PMARK_H
 # define GC_PMARK_H
@@ -37,6 +34,9 @@
 #   include "dbg_mlc.h"
 # endif
 # ifndef GC_MARK_H
+#   ifndef _GC_H
+#     define I_HIDE_POINTERS /* to get HIDE_POINTER() and friends */
+#   endif
 #   include "../gc_mark.h"
 # endif
 # ifndef GC_PRIVATE_H

diff --git a/include/private/gc_priv.h b/include/private/gc_priv.h
index 02bc359442d0d89741fada9cfe4ea9d95ad50c1a..0ea0cd19cad8e407f305f1ffb24d4aadab3c0132 100644 (file)
--- a/include/private/gc_priv.h
+++ b/include/private/gc_priv.h
@@ -52,6 +52,7 @@
 #endif
 
 #ifndef _GC_H
+#   define I_HIDE_POINTERS /* to get HIDE_POINTER() and friends */
 #   include "../gc.h"
 #endif
 

diff --git a/misc.c b/misc.c
index 35e61a2833215acdf6bba8c172d704c9d1faa890..d7bb80db46dd5843b9ce206decfb22d301dd9988 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -14,12 +14,10 @@
  */
 /* Boehm, July 31, 1995 5:02 pm PDT */
 
-
 #include <stdio.h>
 #include <limits.h>
 #include <stdarg.h>
 
-#define I_HIDE_POINTERS /* To make GC_call_with_alloc_lock visible */
 #include "private/gc_pmark.h"
 
 #ifndef MSWINCE