Thu Sep 5 13:09:46 CEST 2002 Paolo Molaro <lupus@ximian.com>

	* gc.c: put HIDE_POINTER/REVEAL_POINTER only here.

svn path=/trunk/mono/; revision=7260

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 80224de470c3d8c95d2ce410cd72f503a5c0037f..6dc9e909d64cff3e5f18784beb221eb0fe57cc9b 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,4 +1,8 @@
 
+Thu Sep 5 13:09:46 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+       * gc.c: put HIDE_POINTER/REVEAL_POINTER only here.
+
 Wed Sep 4 19:23:09 CEST 2002 Paolo Molaro <lupus@ximian.com>
 
        * gc.c: fix weakreferences.

diff --git a/mono/metadata/gc.c b/mono/metadata/gc.c
index c4af42cf6af30f5ad81bc5120785336aca2deb4e..9afd6744ac7f8b6d42020b7ff82d7ec0f74bfda8 100644 (file)
--- a/mono/metadata/gc.c
+++ b/mono/metadata/gc.c
@@ -16,6 +16,11 @@
 #define GC_I_HIDE_POINTERS
 #include <mono/os/gc_wrapper.h>
 
+#ifndef HIDE_POINTER
+#define HIDE_POINTER(v)         (v)
+#define REVEAL_POINTER(v)       (v)
+#endif
+
 static int finalize_slot = -1;
 
 /* 

diff --git a/mono/os/gc_wrapper.h b/mono/os/gc_wrapper.h
index 5ad911ddcd2c5390de19996cedc1d72dcd5bd0f4..b5eed29b2db1d35db45ee88def73d817ca7edbe2 100644 (file)
--- a/mono/os/gc_wrapper.h
+++ b/mono/os/gc_wrapper.h
@@ -1,15 +1,8 @@
 #include <config.h>
 
-#ifdef HAVE_BOEHM_GC
 #ifdef HAVE_GC_GC_H
 #include <gc/gc.h>
 #endif
 #ifdef HAVE_GC_H
 #include <gc.h>
 #endif
-#else  /* HAVE_BOEHM_GC */
-#ifdef GC_I_HIDE_POINTERS
-#define        HIDE_POINTER(v)         (v)
-#define        REVEAL_POINTER(v)       (v)
-#endif
-#endif