Minimize differences with master.

diff --git a/src/etc/compile-boot-compiler.sh b/src/etc/compile-boot-compiler.sh
index 9478509f4a473816ab68f066785513b8fb27f744..582d24aa17520ccc10301042ff3990975b078a04 100755 (executable)
--- 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 683bb3ca189c7364cb44b6c34ec57793444fd2f2..cb381c41b2baa4015529cdbb489fca09e74aa187 100644 (file)
--- 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 dba9c6b95fb1f25c10d1a62c2ec8430d54fcf689..eb2a309d58bad7432a63ddfaa74da4ee766f1ba2 100644 (file)
--- 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