summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libguile/Makefile.am1
-rw-r--r--libguile/bdw-gc.h (renamed from libguile/boehm-gc.h)19
-rw-r--r--libguile/gc.c2
-rw-r--r--libguile/guardians.c2
-rw-r--r--libguile/inline.h2
-rw-r--r--libguile/pthread-threads.h2
-rw-r--r--libguile/smob.c2
-rw-r--r--libguile/smob.h2
-rw-r--r--libguile/srfi-4.c2
-rw-r--r--libguile/struct.c2
-rw-r--r--libguile/threads.c2
-rw-r--r--libguile/vectors.c2
-rw-r--r--libguile/vm.c2
-rw-r--r--libguile/weaks.c2
14 files changed, 23 insertions, 21 deletions
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 046ce21cc..5070de6b8 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -465,6 +465,7 @@ modinclude_HEADERS = \
arrays.h \
async.h \
backtrace.h \
+ bdw-gc.h \
boolean.h \
bitvectors.h \
bytevectors.h \
diff --git a/libguile/boehm-gc.h b/libguile/bdw-gc.h
index b3a85145f..a54785e92 100644
--- a/libguile/boehm-gc.h
+++ b/libguile/bdw-gc.h
@@ -1,21 +1,22 @@
-#ifndef SCM_BOEHM_GC_H
-#define SCM_BOEHM_GC_H
+#ifndef SCM_BDW_GC_H
+#define SCM_BDW_GC_H
/* Copyright (C) 2006, 2008, 2009 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
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 3 of
+ * the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
*/
/* Correct header inclusion. */
@@ -45,4 +46,4 @@
typedef void *GC_PTR;
#endif
-#endif /* SCM_BOEHM_GC_H */
+#endif /* SCM_BDW_GC_H */
diff --git a/libguile/gc.c b/libguile/gc.c
index d3c53c748..7c508affd 100644
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -56,7 +56,7 @@ extern unsigned long * __libc_ia64_register_backing_store_base;
#include "libguile/gc.h"
#include "libguile/dynwind.h"
-#include "libguile/boehm-gc.h"
+#include "libguile/bdw-gc.h"
#ifdef GUILE_DEBUG_MALLOC
#include "libguile/debug-malloc.h"
diff --git a/libguile/guardians.c b/libguile/guardians.c
index 580e212d0..51aa43310 100644
--- a/libguile/guardians.c
+++ b/libguile/guardians.c
@@ -62,7 +62,7 @@
#include "libguile/eval.h"
#include "libguile/guardians.h"
-#include "libguile/boehm-gc.h"
+#include "libguile/bdw-gc.h"
diff --git a/libguile/inline.h b/libguile/inline.h
index 49431697f..93be809d1 100644
--- a/libguile/inline.h
+++ b/libguile/inline.h
@@ -78,7 +78,7 @@
"inline.c", when `inline' is not supported at all or when "extern inline"
is used. */
-#include "libguile/boehm-gc.h"
+#include "libguile/bdw-gc.h"
SCM_API SCM scm_cell (scm_t_bits car, scm_t_bits cdr);
diff --git a/libguile/pthread-threads.h b/libguile/pthread-threads.h
index 4f72a4293..ca72f1674 100644
--- a/libguile/pthread-threads.h
+++ b/libguile/pthread-threads.h
@@ -30,7 +30,7 @@
#include <sched.h>
/* `libgc' intercepts pthread calls by defining wrapping macros. */
-#include "libguile/boehm-gc.h"
+#include "libguile/bdw-gc.h"
/* Threads
*/
diff --git a/libguile/smob.c b/libguile/smob.c
index 86bb22f47..22b90ad64 100644
--- a/libguile/smob.c
+++ b/libguile/smob.c
@@ -38,7 +38,7 @@
#include "libguile/smob.h"
-#include "libguile/boehm-gc.h"
+#include "libguile/bdw-gc.h"
#include <gc/gc_mark.h>
diff --git a/libguile/smob.h b/libguile/smob.h
index d435bacb8..ca4a418be 100644
--- a/libguile/smob.h
+++ b/libguile/smob.h
@@ -26,7 +26,7 @@
#include "libguile/__scm.h"
#include "libguile/print.h"
-#include "libguile/boehm-gc.h"
+#include "libguile/bdw-gc.h"
diff --git a/libguile/srfi-4.c b/libguile/srfi-4.c
index 302414364..af8eaa3c3 100644
--- a/libguile/srfi-4.c
+++ b/libguile/srfi-4.c
@@ -28,7 +28,7 @@
#include "libguile/_scm.h"
#include "libguile/__scm.h"
-#include "libguile/boehm-gc.h"
+#include "libguile/bdw-gc.h"
#include "libguile/srfi-4.h"
#include "libguile/bitvectors.h"
#include "libguile/bytevectors.h"
diff --git a/libguile/struct.c b/libguile/struct.c
index b7e72a719..7b25f7fef 100644
--- a/libguile/struct.c
+++ b/libguile/struct.c
@@ -41,7 +41,7 @@
#include <string.h>
#endif
-#include "libguile/boehm-gc.h"
+#include "libguile/bdw-gc.h"
diff --git a/libguile/threads.c b/libguile/threads.c
index ab01f0d1c..66e34747a 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -22,7 +22,7 @@
# include <config.h>
#endif
-#include "libguile/boehm-gc.h"
+#include "libguile/bdw-gc.h"
#include "libguile/_scm.h"
#if HAVE_UNISTD_H
diff --git a/libguile/vectors.c b/libguile/vectors.c
index 190e3e321..4198c5462 100644
--- a/libguile/vectors.c
+++ b/libguile/vectors.c
@@ -41,7 +41,7 @@
#include "libguile/dynwind.h"
#include "libguile/deprecation.h"
-#include "libguile/boehm-gc.h"
+#include "libguile/bdw-gc.h"
diff --git a/libguile/vm.c b/libguile/vm.c
index 95aaa4fe4..aee276824 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -25,7 +25,7 @@
#include <string.h>
#include <assert.h>
-#include "libguile/boehm-gc.h"
+#include "libguile/bdw-gc.h"
#include <gc/gc_mark.h>
#include "_scm.h"
diff --git a/libguile/weaks.c b/libguile/weaks.c
index 92fb305cc..abe929254 100644
--- a/libguile/weaks.c
+++ b/libguile/weaks.c
@@ -32,7 +32,7 @@
#include "libguile/validate.h"
#include "libguile/weaks.h"
-#include "libguile/boehm-gc.h"
+#include "libguile/bdw-gc.h"
#include <gc/gc_typed.h>