Minimized diffs between master and Gtk.

diff --git a/doc/ffi/ffi.texinfo b/doc/ffi/ffi.texinfo
index b0dbc157a4688cea0bd44873888ff2762bd27aca..0ab9f6fd1258913ad9bca75a8a77b4c307e8b55b 100644 (file)
--- a/doc/ffi/ffi.texinfo
+++ b/doc/ffi/ffi.texinfo
@@ -596,6 +596,7 @@ primitive, bypassing the runtime's I/O buffering and thread switching.
 Thus trace messages from multiple threads will appear on stderr intact
 and uninterrupted.
 
+
 @node Compiling and Linking, Hello World, Callbacks, Top
 @chapter Compiling and Linking
 

diff --git a/src/gtk/gio.scm b/src/gtk/gio.scm
index 0c5a5c484fed46c286d15fea9dd8b70074a1f10c..04ccd89d444897d8231989716051d8a8ed939e28 100644 (file)
--- a/src/gtk/gio.scm
+++ b/src/gtk/gio.scm
@@ -1151,7 +1151,7 @@ USA.
 (define (peek-gstrv! alien)
   (let loop ()
     (let ((str (c-peek-cstringp! alien)))
-      (if (not str)
+      (if (null? str)
          '()
          (cons str (loop))))))
 

diff --git a/src/microcode/pruxffi.c b/src/microcode/pruxffi.c
index 21173e4f02bddcfd0610fdeaf19df826893993fd..511a8aa83f2ea62d939f4ab672d01601fd29dda9 100644 (file)
--- a/src/microcode/pruxffi.c
+++ b/src/microcode/pruxffi.c
@@ -1043,8 +1043,7 @@ empty_list (void)
 
 DEFINE_PRIMITIVE ("OUTF-ERROR", Prim_outf_error, 1, 1, 0)
 {
-  /* To avoid the normal i/o system when debugging a callback.  Uses
-     the Unix "stderr" channel. */
+  /* To avoid the normal i/o system when debugging a callback. */
 
   PRIMITIVE_HEADER (1);
   { 

diff --git a/src/microcode/uxctty.c b/src/microcode/uxctty.c
index 563cdd4bff183f2614b811dea844b25d1c869268..e9585d4982a0323d6c3414e73bb8de0953c7f263 100644 (file)
--- a/src/microcode/uxctty.c
+++ b/src/microcode/uxctty.c
@@ -242,6 +242,7 @@ OS_ctty_interrupt_control (void)
 {
   return (outside_ctty_state . recorded_p);
 }
+
 int
 UX_terminal_control_ok (int fd)
 {

diff --git a/src/runtime/genio.scm b/src/runtime/genio.scm
index 9dde0748d206ecf5b38bb00e1b612cadff3726b6..6a3b6cfa40fb3388565370be98d8d41958cbb871 100644 (file)
--- a/src/runtime/genio.scm
+++ b/src/runtime/genio.scm
@@ -28,7 +28,7 @@ USA.
 ;;; package: (runtime generic-i/o-port)
 
 (declare (usual-integrations)
-        (integrate-external "port" "string"))
+        (integrate-external "port"))
 \f
 (define (make-generic-i/o-port source sink #!optional type . extra-state)
   (if (not (or source sink))