Two fixes to GC build problems.

svn: r583

diff --git a/include/private/gc_priv.h b/include/private/gc_priv.h
index c28ecfa09fdd6cc48d6a42f8d3512c76886036b6..19dc66e9a729caf9d30c1b9335925757db24e5f1 100644 (file)
--- a/include/private/gc_priv.h
+++ b/include/private/gc_priv.h
@@ -1817,17 +1817,6 @@ GC_API void GC_dump GC_PROTO((void));
 #  define GC_MARKED_FOR_FINALIZATION(dest)
 #endif
 
-/* Make arguments appear live to compiler */
-# ifdef __WATCOMC__
-    void GC_noop(void*, ...);
-# else
-#   ifdef __DMC__
-      GC_API void GC_noop(...);
-#   else
-      GC_API void GC_noop();
-#   endif
-# endif
-
 void GC_noop1 GC_PROTO((word));
 
 /* Logging and diagnostic output:      */

diff --git a/mark.c b/mark.c
index 3d541a00786023d3356b06646b6bf6dc0970a1eb..0d510e1b9db9a6eb40210309281d671730a33fa0 100644 (file)
--- a/mark.c
+++ b/mark.c
@@ -25,11 +25,7 @@
 
 /* We put this here to minimize the risk of inlining. */
 /*VARARGS*/
-#ifdef __WATCOMC__
-  void GC_noop(void *p, ...) {}
-#else
-  void GC_noop() {}
-#endif
+void GC_noop(void *p, ...) {}
 
 /* Single argument version, robust against whole program analysis. */
 void GC_noop1(x)