--- gc.c.~1.244.~	2003-04-07 08:05:08.000000000 +1000
+++ gc.c	2003-08-14 07:06:36.000000000 +1000
@@ -656,6 +656,12 @@
  *   scm_remember_upto_here_1 (str);  // str will be alive up to this point.
  */
 
+/* Remove any macro versions of these while defining the functions.
+   Functions are always included in the library, for upward binary
+   compatibility and in case combinations of GCC and non-GCC are used.  */
+#undef scm_remember_upto_here_1
+#undef scm_remember_upto_here_2
+
 void
 scm_remember_upto_here_1 (SCM obj SCM_UNUSED)
 {