From a0c121aee6d8a345f1985153a55910f419963f55 Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Mon, 1 Oct 2018 16:30:16 -0700
Subject: [PATCH] Minimize differences with master.

---
 src/etc/compile-boot-compiler.sh | 2 +-
 src/runtime/ed-ffi.scm           | 3 +++
 src/runtime/runtime.pkg          | 3 +--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/etc/compile-boot-compiler.sh b/src/etc/compile-boot-compiler.sh
index 9478509f4..582d24aa1 100755
--- a/src/etc/compile-boot-compiler.sh
+++ b/src/etc/compile-boot-compiler.sh
@@ -70,5 +70,5 @@ run_cmd "${EXE}" --batch-mode --library lib --band x-runtime.com <<EOF
   (disk-save "lib/x-compiler.com"))
 EOF
 
-# Remove host (native) code (.bins as well as .coms) to STAGEX/ subdirs.
+# Remove host (native) code to STAGEX/ subdirs.
 run_cmd ./Stage.sh make X
diff --git a/src/runtime/ed-ffi.scm b/src/runtime/ed-ffi.scm
index 683bb3ca1..cb381c41b 100644
--- a/src/runtime/ed-ffi.scm
+++ b/src/runtime/ed-ffi.scm
@@ -34,6 +34,7 @@ USA.
     ("apropos"	(runtime apropos))
     ("arith"	(runtime number))
     ("bitstr"	(runtime bit-string))
+    ("blowfish"	(runtime blowfish))
     ("boole"	(runtime boolean))
     ("boot"	(runtime boot-definitions))
     ("char"	(runtime character))
@@ -120,6 +121,7 @@ USA.
     ("packag"	(package))
     ("parser-buffer" (runtime parser-buffer))
     ("pathname"	(runtime pathname))
+    ("pgsql"	(runtime postgresql))
     ("poplat"	(runtime population))
     ("pp"	(runtime pretty-printer))
     ("prgcop"	(runtime program-copier))
@@ -190,5 +192,6 @@ USA.
     ("world-report" (runtime world-report))
     ("wrkdir"	(runtime working-directory))
     ("wttree"	(runtime wt-tree))
+    ("x11graph"	(runtime x-graphics))
     ("xeval"	(runtime extended-scode-eval))
     ("ystep"	(runtime stepper))))
\ No newline at end of file
diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg
index dba9c6b95..eb2a309d5 100644
--- a/src/runtime/runtime.pkg
+++ b/src/runtime/runtime.pkg
@@ -4244,8 +4244,7 @@ USA.
 	  image/width
 	  image?
 	  make-graphics-device
-	  make-graphics-device-type
-	  make-image-type))
+	  make-graphics-device-type))
 
 (define-package (runtime x-graphics)
   (file-case os-type
-- 
2.25.1