From 26a2702a93f6ceccc0bbf639022d17a0995b3ef3 Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birkholz.chandler.az.us>
Date: Thu, 18 Aug 2011 20:13:03 -0700
Subject: [PATCH] Minimized diffs between master and Gtk.

---
 doc/ffi/ffi.texinfo     | 1 +
 src/gtk/gio.scm         | 2 +-
 src/microcode/pruxffi.c | 3 +--
 src/microcode/uxctty.c  | 1 +
 src/runtime/genio.scm   | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/ffi/ffi.texinfo b/doc/ffi/ffi.texinfo
index b0dbc157a..0ab9f6fd1 100644
--- 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 0c5a5c484..04ccd89d4 100644
--- 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 21173e4f0..511a8aa83 100644
--- 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 563cdd4bf..e9585d498 100644
--- 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 9dde0748d..6a3b6cfa4 100644
--- 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"))
 
 (define (make-generic-i/o-port source sink #!optional type . extra-state)
   (if (not (or source sink))
-- 
2.25.1