From: Nikodemus Siivola <nikodemus@random-state.net>
Date: Tue, 2 Dec 2008 19:15:30 +0000 (+0000)
Subject: 1.0.23.14: fix CheyneyGC build
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=237f2c62f339d84e3813ec2a3799f3e17a097d40;p=sbcl.git

1.0.23.14: fix CheyneyGC build

 * Tested on PPC/Darwin.
---

diff --git a/src/runtime/alloc.c b/src/runtime/alloc.c
index fcff8cc..359e031 100644
--- a/src/runtime/alloc.c
+++ b/src/runtime/alloc.c
@@ -172,7 +172,6 @@ alloc_sap(void *ptr)
 lispobj
 alloc_code_object (unsigned boxed, unsigned unboxed) {
     struct code * code;
-    unsigned size;
     boxed = make_fixnum(boxed + 1 + 4); /* 4 == trace_table_offset offset in words */
     boxed &= ~LOWTAG_MASK;
 
diff --git a/src/runtime/cheneygc-internal.h b/src/runtime/cheneygc-internal.h
index 5b58bf6..64b8a7c 100644
--- a/src/runtime/cheneygc-internal.h
+++ b/src/runtime/cheneygc-internal.h
@@ -1,3 +1,16 @@
+/*
+ * This software is part of the SBCL system. See the README file for
+ * more information.
+ *
+ * This software is derived from the CMU CL system, which was
+ * written at Carnegie Mellon University and released into the
+ * public domain. The software is in the public domain and is
+ * provided with absolutely no warranty. See the COPYING and CREDITS
+ * files for more information.
+ */
+
+#include "os.h" /* for os_context_t */
+
 extern lispobj *from_space;
 extern lispobj *from_space_free_pointer;
 
diff --git a/src/runtime/cheneygc.c b/src/runtime/cheneygc.c
index dc45e46..2f4e9d0 100644
--- a/src/runtime/cheneygc.c
+++ b/src/runtime/cheneygc.c
@@ -86,7 +86,7 @@ zero_stack(void)
 }
 
 
-static void *
+void *
 gc_general_alloc(long bytes, int page_type_flag, int quick_p) {
     lispobj *new=new_space_free_pointer;
     new_space_free_pointer+=(bytes/N_WORD_BYTES);
diff --git a/src/runtime/gc-internal.h b/src/runtime/gc-internal.h
index 276c9c3..fbdda47 100644
--- a/src/runtime/gc-internal.h
+++ b/src/runtime/gc-internal.h
@@ -97,7 +97,7 @@ gc_general_alloc(long nbytes, int page_type_flag, int quick_p)
     return gc_alloc_with_region(nbytes, page_type_flag, my_region, quick_p);
 }
 #else
-void *gc_general_alloc(long nbytes,int page_type_flag,int quick_p);
+extern void *gc_general_alloc(long nbytes,int page_type_flag,int quick_p);
 #endif
 
 extern long (*scavtab[256])(lispobj *where, lispobj object);
diff --git a/version.lisp-expr b/version.lisp-expr
index cf1bee7..14c8164 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.23.13"
+"1.0.23.14"