Changes required by SBCL 1.0.6/more symbols exported from the CLG package

diff --git a/gtk/defpackage.lisp b/gtk/defpackage.lisp
index 66f5ae803b8d2bc3dedc8bf5d513ecb6bb76b334..54f0689d2304a3daa7c01a464e853d37a86d0e74 100644 (file)
--- a/gtk/defpackage.lisp
+++ b/gtk/defpackage.lisp
@@ -9,7 +9,7 @@ (defpackage "GTK"
           "ADD-READER-METHOD" "ADD-WRITER-METHOD")
   #+(or cmu sbcl)
   (:import-from #+cmu"SYSTEM" #+sbcl"SB-SYS" "SAP-INT" "ADD-FD-HANDLER" "REMOVE-FD-HANDLER")
           "ADD-READER-METHOD" "ADD-WRITER-METHOD")
   #+(or cmu sbcl)
   (:import-from #+cmu"SYSTEM" #+sbcl"SB-SYS" "SAP-INT" "ADD-FD-HANDLER" "REMOVE-FD-HANDLER")

-  #?(or (pkg-config:featurep :cmu) (and (pkg-config:featurep :sbcl) (not (pkg-config:sbcl>= 1 0 6))))
+  #?(or (pkg-config:featurep :cmu) (pkg-config:sbcl< 1 0 6))

   (:import-from #+cmu"LISP" #+sbcl"SB-IMPL"
           "*PERIODIC-POLLING-FUNCTION*" "*MAX-EVENT-TO-SEC*" 
           "*MAX-EVENT-TO-USEC*")               
   (:import-from #+cmu"LISP" #+sbcl"SB-IMPL"
           "*PERIODIC-POLLING-FUNCTION*" "*MAX-EVENT-TO-SEC*" 
           "*MAX-EVENT-TO-USEC*")               


@@ -27,9 +27,13 @@ (defpackage "GTK"
 
 (defpackage "CLG"
   (:use "GLIB" "GTK")
 
 (defpackage "CLG"
   (:use "GLIB" "GTK")

-  ;; Symbols re-exported from the GTK package
-  (:export "TOGGLE" "CONTAINRE-CHILD")
-  ;; Symbols re-exported from GLIB package
+  ;; Symbols re-exported from the GLIB package

   (:export "SIGNAL-EMIT-STOP" "SIGNAL-CONNECT" "SIGNAL-DISCONNECT"
           "SIGNAL-HANDLER-BLOCK" "SIGNAL-HANDLER-UNBLOCK"
   (:export "SIGNAL-EMIT-STOP" "SIGNAL-CONNECT" "SIGNAL-DISCONNECT"
           "SIGNAL-HANDLER-BLOCK" "SIGNAL-HANDLER-UNBLOCK"

-          "TIMEOUT-ADD" "TIMEOUT-REMOVE" "IDLE-ADD" "IDLE-REMOVE"))
+          "TIMEOUT-ADD" "TIMEOUT-REMOVE" "IDLE-ADD" "IDLE-REMOVE")
+  ;; Symbols re-exported from the GDK package 
+  (:import-from "GDK" "TIMEOUT-ADD-WITH-LOCK" "IDLE-ADD-WITH-LOCK")
+  (:export "TIMEOUT-ADD-WITH-LOCK" "IDLE-ADD-WITH-LOCK")
+  ;; Symbols not automatically re-exported from the GTK package
+  (:export "TOGGLE" "CONTAINER-CHILD"))
+