X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/112ac1d33aa8f9b7f3d2f9542d15431f152b1d35..b238749d7115db31b5fd93210853aa0a7180937b:/glib/defpackage.lisp

diff --git a/glib/defpackage.lisp b/glib/defpackage.lisp
index eab94b2..5512823 100644
--- a/glib/defpackage.lisp
+++ b/glib/defpackage.lisp
@@ -20,28 +20,28 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: defpackage.lisp,v 1.7 2005-04-23 16:48:50 espen Exp $
+;; $Id: defpackage.lisp,v 1.11 2006-02-19 19:18:31 espen Exp $
 
 ;(export 'kernel::type-expand-1 "KERNEL")
 
 (defpackage "GLIB"
   (:use "COMMON-LISP""AUTOEXPORT")
   #+cmu(:use "SYSTEM" "KERNEL" "PCL" "EXT")
-  #+sbcl(:use "SB-SYS" "SB-KERNEL" "SB-PCL" "SB-EXT")
+  #+sbcl(:use "SB-SYS" "SB-KERNEL" "SB-MOP" "SB-EXT")
   #+cmu(:shadowing-import-from "PCL"
            "CLASS-DIRECT-SUPERCLASSES" "CLASS-DIRECT-SUPERCLASSES")
   (:shadow "POINTER")
   (:import-from #+cmu"PCL" #+sbcl"SB-PCL"
-	   "LOCATION" "ALLOCATION" "DIRECT-SLOTS" 
 	   "READER-FUNCTION" "WRITER-FUNCTION" "BOUNDP-FUNCTION" 
 	   "INITIALIZE-INTERNAL-SLOT-FUNCTIONS" "COMPUTE-SLOT-ACCESSOR-INFO"
 	   "COMPUTE-EFFECTIVE-SLOT-DEFINITION-INITARGS"
-	   "INITIALIZE-INTERNAL-SLOT-GFS")
+	   #-sbcl>=0.9.8"INITIALIZE-INTERNAL-SLOT-GFS")
   #+sbcl(:import-from "SB-EXT" "COLLECT")
   #+cmu(:import-from "ALIEN" "CALLBACK")
   (:import-from #+cmu"ALIEN" #+sbcl"SB-ALIEN" 
 	   "WITH-ALIEN" "ALIEN-FUNCALL" "%HEAP-ALIEN" "MAKE-HEAP-ALIEN-INFO" 
-	   "ADDR" "PARSE-ALIEN-TYPE" "SYSTEM-AREA-POINTER" "EXTERN-ALIEN")
+	   "ADDR" "PARSE-ALIEN-TYPE" "SYSTEM-AREA-POINTER" "EXTERN-ALIEN"
+	   "ALIEN-SAP")
   #+cmu(:import-from "C-CALL" "%NATURALIZE-C-STRING" "VOID")
   #+sbcl(:import-from "SB-ALIEN" 
 	   "%NATURALIZE-UTF8-STRING"  "%DEPORT-UTF8-STRING" "VOID")
@@ -49,11 +49,11 @@ (defpackage "GLIB"
 	   "TRANSLATE-FROM-ALIEN" "CLEANUP-ALIEN" "UNREFERENCE-ALIEN"
 	   "SIZE-OF" "UNBOUND-VALUE")
   (:export "DEFBINDING" "DEFINE-FOREIGN" "MKBINDING" "USE-PREFIX"
-	   "PACKAGE-PREFIX" "DEFCALLBACK" "CALLBACK")
+	   "PACKAGE-PREFIX" "DEFCALLBACK" "CALLBACK" "CALL-NEXT-HANDLER"
+	   "DEFINE-CALLBACK" "CALLBACK-ADDRESS" "USER-DATA-DESTROY-CALLBACK")
   (:export "LONG" "UNSIGNED-LONG" "INT" "UNSIGNED-INT" "SHORT" "UNSIGNED-SHORT"
 	   "SIGNED" "UNSIGNED" "CHAR" "POINTER" "COPY-OF")
-  (:export "LOCATION" "ALLOCATION" "DIRECT-SLOTS" "READER-FUNCTION" 
-	   "WRITER-FUNCTION" "BOUNDP-FUNCTION" 
+  (:export "LOCATION" "READER-FUNCTION" "WRITER-FUNCTION" "BOUNDP-FUNCTION" 
 	   "INITIALIZE-INTERNAL-SLOT-FUNCTIONS"
 	   "COMPUTE-EFFECTIVE-SLOT-DEFINITION-INITARGS"))