From ea95df99da598aae2ecc3b9285ceb4e9404ca619 Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Thu, 21 May 2009 16:22:54 +0000 Subject: [PATCH] 1.0.28.67: fix build on powerpc-linux lose() was not getting declared early enough; shuffle header files around to ensure interr.h gets included before gc.h in the relevant places. --- src/runtime/interrupt.c | 2 +- src/runtime/runtime.c | 4 ++-- src/runtime/thread.c | 2 +- version.lisp-expr | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/runtime/interrupt.c b/src/runtime/interrupt.c index 13ff61d..4f33522 100644 --- a/src/runtime/interrupt.c +++ b/src/runtime/interrupt.c @@ -59,10 +59,10 @@ #include "globals.h" #include "lispregs.h" #include "validate.h" +#include "interr.h" #include "gc.h" #include "alloc.h" #include "dynbind.h" -#include "interr.h" #include "pseudo-atomic.h" #include "genesis/fdefn.h" #include "genesis/simple-fun.h" diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c index 45f7eec..573b389 100644 --- a/src/runtime/runtime.c +++ b/src/runtime/runtime.c @@ -43,14 +43,14 @@ #include "signal.h" #include "runtime.h" -#include "alloc.h" #include "vars.h" #include "globals.h" #include "os.h" +#include "interr.h" +#include "alloc.h" #include "interrupt.h" #include "arch.h" #include "gc.h" -#include "interr.h" #include "validate.h" #include "core.h" #include "save.h" diff --git a/src/runtime/thread.c b/src/runtime/thread.c index f594d56..08627d6 100644 --- a/src/runtime/thread.c +++ b/src/runtime/thread.c @@ -33,7 +33,6 @@ #include "runtime.h" #include "validate.h" /* for BINDING_STACK_SIZE etc */ -#include "alloc.h" #include "thread.h" #include "arch.h" #include "target-arch-os.h" @@ -43,6 +42,7 @@ #include "genesis/cons.h" #include "genesis/fdefn.h" #include "interr.h" /* for lose() */ +#include "alloc.h" #include "gc-internal.h" #ifdef LISP_FEATURE_WIN32 diff --git a/version.lisp-expr b/version.lisp-expr index e8d9473..564e940 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.28.66" +"1.0.28.67" -- 1.7.10.4