2010-08-12 Ivan Maidanski <ivmai@mail.ru> (mostly really Mike Gran)

	* include/gc.h (GC_MALLOC_STUBBORN): Remove trailing ';' in the
	macro definition.
	* include/gc.h (GC_reachable_here): Ditto.
	* include/gc.h (GC_reachable_here): Prefix and postfix "volatile"
	with double '_'.

diff --git a/ChangeLog b/ChangeLog
index 75f86b4586c8f65fb416281de9a7322562aabac9..a98bd6cf8736b91aef6ed5d177ee2b28267ff128 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-12  Ivan Maidanski <ivmai@mail.ru> (mostly really Mike Gran)
+
+       * include/gc.h (GC_MALLOC_STUBBORN): Remove trailing ';' in the
+       macro definition.
+       * include/gc.h (GC_reachable_here): Ditto.
+       * include/gc.h (GC_reachable_here): Prefix and postfix "volatile"
+       with double '_'.
+
 2010-07-29  Ivan Maidanski <ivmai@mail.ru> (with input from NIIBE Yutaka)
 
        * pthread_start.c: New file.

diff --git a/include/gc.h b/include/gc.h
index 0a23726387c7c6693c7ea6f423689dc5323402ac..a0c2962b48ae173b1f1ae17bc35ba7a5da064897 100644 (file)
--- a/include/gc.h
+++ b/include/gc.h
@@ -715,7 +715,7 @@ GC_API void * GC_CALL GC_debug_realloc_replacement(void * /* object_addr */,
       GC_debug_register_finalizer_no_order(p, f, d, of, od)
 # define GC_REGISTER_FINALIZER_UNREACHABLE(p, f, d, of, od) \
       GC_debug_register_finalizer_unreachable(p, f, d, of, od)
-# define GC_MALLOC_STUBBORN(sz) GC_debug_malloc_stubborn(sz, GC_EXTRAS);
+# define GC_MALLOC_STUBBORN(sz) GC_debug_malloc_stubborn(sz, GC_EXTRAS)
 # define GC_CHANGE_STUBBORN(p) GC_debug_change_stubborn(p)
 # define GC_END_STUBBORN_CHANGE(p) GC_debug_end_stubborn_change(p)
 # define GC_GENERAL_REGISTER_DISAPPEARING_LINK(link, obj) \
@@ -952,10 +952,10 @@ GC_API int GC_CALL GC_invoke_finalizers(void);
 /* settings.                                                    */
 #if defined(__GNUC__) && !defined(__INTEL_COMPILER)
 # define GC_reachable_here(ptr) \
-  __asm__ volatile(" " : : "X"(ptr) : "memory");
+                __asm__ __volatile__(" " : : "X"(ptr) : "memory")
 #else
   GC_API void GC_CALL GC_noop1(GC_word);
-# define GC_reachable_here(ptr) GC_noop1((GC_word)(ptr));
+# define GC_reachable_here(ptr) GC_noop1((GC_word)(ptr))
 #endif
 
 /* GC_set_warn_proc can be used to redirect or filter warning messages. */