From: Juho Snellman <jsnell@iki.fi>
Date: Mon, 18 Jun 2007 22:42:12 +0000 (+0000)
Subject: 1.0.6.55: fix ppc/linux build (probably)
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;ds=inline;h=411c3cae7ab69dc023912d87d891e75d9aa083b4;p=sbcl.git

1.0.6.55: fix ppc/linux build (probably)
---

diff --git a/src/runtime/linux-os.h b/src/runtime/linux-os.h
index e72aa72..cfeaed4 100644
--- a/src/runtime/linux-os.h
+++ b/src/runtime/linux-os.h
@@ -23,15 +23,16 @@
 #include <asm/unistd.h>
 #include <linux/version.h>
 
-#include "target-arch-os.h"
-#include "target-arch.h"
-#define linuxversion(a, b, c) (((a)<<16)+((b)<<8)+(c))
-
+// Needs to be defined before including target-arch.h
 typedef caddr_t os_vm_address_t;
 typedef size_t os_vm_size_t;
 typedef off_t os_vm_offset_t;
 typedef int os_vm_prot_t;
 
+#include "target-arch-os.h"
+#include "target-arch.h"
+#define linuxversion(a, b, c) (((a)<<16)+((b)<<8)+(c))
+
 #define OS_VM_PROT_READ    PROT_READ
 #define OS_VM_PROT_WRITE   PROT_WRITE
 #define OS_VM_PROT_EXECUTE PROT_EXEC
diff --git a/version.lisp-expr b/version.lisp-expr
index 6da7f50..9a9b13c 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.6.54"
+"1.0.6.55"