From 5a5dd94922006632e91ffeddc0d098b835e71fd1 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 11 Jan 2017 01:13:13 -0800
Subject: [PATCH] A bunch of fixes so that the code still builds with the 9.2
 compiler.

---
 src/runtime/port.scm               | 7 +++++++
 src/runtime/predicate-metadata.scm | 3 ---
 src/sf/gconst.scm                  | 8 ++++----
 src/sf/usiexp.scm                  | 2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/runtime/port.scm b/src/runtime/port.scm
index 657c51fbe..9f204dacc 100644
--- a/src/runtime/port.scm
+++ b/src/runtime/port.scm
@@ -790,6 +790,13 @@ USA.
 (define interaction-i/o-port)
 
 (define (initialize-package!)
+  ;; TODO(cph): This expression is temporary to prevent the build from breaking.
+  ;; It will be removed in a subsequent change.
+  (if (not (predicate? port?))
+      (register-predicate! port? 'port))
+  (register-predicate! input-port? 'input-port '<= port?)
+  (register-predicate! output-port? 'output-port '<= port?)
+  (register-predicate! i/o-port? 'i/o-port '<= (list input-port? output-port?))
   (set! current-input-port (make-port-parameter guarantee-input-port))
   (set! current-output-port (make-port-parameter guarantee-output-port))
   (set! notification-output-port (make-port-parameter guarantee-output-port))
diff --git a/src/runtime/predicate-metadata.scm b/src/runtime/predicate-metadata.scm
index d26dcf342..03103aa06 100644
--- a/src/runtime/predicate-metadata.scm
+++ b/src/runtime/predicate-metadata.scm
@@ -219,10 +219,8 @@ USA.
    (register-predicate! char? 'char)
    (register-predicate! default-object? 'default-object)
    (register-predicate! eof-object? 'eof-object)
-   (register-predicate! input-port? 'input-port '<= port?)
    (register-predicate! list? 'list)
    (register-predicate! number? 'number)
-   (register-predicate! output-port? 'output-port '<= port?)
    (register-predicate! pair? 'pair)
    (register-predicate! procedure? 'procedure)
    (register-predicate! string? 'string)
@@ -304,7 +302,6 @@ USA.
    (register-predicate! environment? 'environment)
    (register-predicate! equality-predicate? 'equality-predicate
 			'<= binary-procedure?)
-   (register-predicate! i/o-port? 'i/o-port '<= (list input-port? output-port?))
    (register-predicate! interned-symbol? 'interned-symbol '<= symbol?)
    (register-predicate! keyword? 'keyword '<= symbol?)
    (register-predicate! lambda-tag? 'lambda-tag)
diff --git a/src/sf/gconst.scm b/src/sf/gconst.scm
index 01e2bf885..6ee3a1fdb 100644
--- a/src/sf/gconst.scm
+++ b/src/sf/gconst.scm
@@ -66,10 +66,10 @@ USA.
     (BIT-STRING? BIT-STRING?)
     (BIT-SUBSTRING-FIND-NEXT-SET-BIT BIT-SUBSTRING-FIND-NEXT-SET-BIT)
     (BIT-SUBSTRING-MOVE-RIGHT! BIT-SUBSTRING-MOVE-RIGHT!)
-    (BYTEVECTOR-LENGTH BYTEVECTOR-LENGTH)
-    (BYTEVECTOR-U8-REF BYTEVECTOR-U8-REF)
-    (BYTEVECTOR-U8-SET! BYTEVECTOR-U8-SET!)
-    (BYTEVECTOR? BYTEVECTOR?)
+    (BYTEVECTOR-LENGTH BYTEVECTOR-LENGTH 1)
+    (BYTEVECTOR-U8-REF BYTEVECTOR-U8-REF 2)
+    (BYTEVECTOR-U8-SET! BYTEVECTOR-U8-SET! 3)
+    (BYTEVECTOR? BYTEVECTOR? 1)
     (CAR CAR)
     (CDR CDR)
     (CELL-CONTENTS CELL-CONTENTS)
diff --git a/src/sf/usiexp.scm b/src/sf/usiexp.scm
index fd26bf03a..96da1ae46 100644
--- a/src/sf/usiexp.scm
+++ b/src/sf/usiexp.scm
@@ -864,7 +864,7 @@ USA.
 	   zero?-expansion)
 	  (map (lambda (p)
 		 (make-primitive-expander
-		  (make-primitive-procedure (cadr p))))
+		  (apply make-primitive-procedure (cdr p))))
 	       global-primitives)))
 
 (define usual-integrations/expansion-alist
-- 
2.25.1