From 6cc323e2ff4e555d58e115032016a50ef15a1948 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 26 Mar 2009 18:47:28 +0100
Subject: [PATCH] Remove multiple definition of `scm_i_marking'.

* libguile/private-gc.h (scm_i_marking): Turn definition into a
  declaration.
  (scm_mark_all): Mark as `SCM_INTERNAL'.

* libguile/gc-mark.c (scm_i_marking): New definition.
---
 libguile/gc-mark.c    | 2 ++
 libguile/private-gc.h | 9 ++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libguile/gc-mark.c b/libguile/gc-mark.c
index 4eef19102..88bea8052 100644
--- a/libguile/gc-mark.c
+++ b/libguile/gc-mark.c
@@ -64,6 +64,8 @@ extern unsigned long * __libc_ia64_register_backing_store_base;
 #include <unistd.h>
 #endif
 
+int scm_i_marking = 0;
+
 /*
   Entry point for this file.
  */
diff --git a/libguile/private-gc.h b/libguile/private-gc.h
index f5331ab1e..125ef3a23 100644
--- a/libguile/private-gc.h
+++ b/libguile/private-gc.h
@@ -1,7 +1,7 @@
 /*
  * private-gc.h - private declarations for garbage collection.
  * 
- * Copyright (C) 2002, 03, 04, 05, 06, 07, 08 Free Software Foundation, Inc.
+ * Copyright (C) 2002, 03, 04, 05, 06, 07, 08, 09 Free Software Foundation, Inc.
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -164,11 +164,10 @@ scm_i_gc_heap_size_delta (scm_t_cell_type_statistics * freelist);
   gc-mark
  */
 
-/* this can be used to ensure that set/clear gc marks only happen when
-   allowed. */
-int scm_i_marking;
+/* Non-zero while in the mark phase.  */
+SCM_INTERNAL int scm_i_marking;
 
-void scm_mark_all (void);
+SCM_INTERNAL void scm_mark_all (void);
 
 /*
 gc-segment: