Hopefully allow (require :glib) again.

[clg] / gffi / defpackage.lisp

diff --git a/gffi/defpackage.lisp b/gffi/defpackage.lisp
index 4fdde99..2e9148a 100644 (file)
--- a/gffi/defpackage.lisp
+++ b/gffi/defpackage.lisp
@@ -20,7 +20,7 @@
 ;; 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.15 2008-11-06 17:26:53 espen Exp $
+;; $Id: defpackage.lisp,v 1.16 2008-12-10 02:39:17 espen Exp $
 
 (defpackage "GFFI"
   (:use "COMMON-LISP" "AUTOEXPORT" "PKG-CONFIG" "CLG-UTILS")
@@ -30,12 +30,6 @@
   #+(or cmu sbcl)(:shadow "POINTER")
   #+cmu(:shadowing-import-from "PCL" "CLASS-DIRECT-SUPERCLASSES")
   #+clisp(:shadow "TYPE-EXPAND-1" "SLOT-DEFINITION-TYPE" "BYTE")
-  #+(or cmu sbcl)
-  (:import-from #+cmu"PCL" #+sbcl"SB-PCL"
-          "READER-FUNCTION" "WRITER-FUNCTION" "BOUNDP-FUNCTION" 
-          "INITIALIZE-INTERNAL-SLOT-FUNCTIONS" "COMPUTE-SLOT-ACCESSOR-INFO"
-          "COMPUTE-EFFECTIVE-SLOT-DEFINITION-INITARGS"
-          #?-(pkg-config:sbcl>= 0 9 8)"INITIALIZE-INTERNAL-SLOT-GFS")
   #+cmu(:import-from "ALIEN" "CALLBACK")
   #+(or cmu sbcl)
   (:import-from #+cmu"ALIEN" #+sbcl"SB-ALIEN" 
@@ -44,6 +38,14 @@
           "ALIEN-SAP")
   #+cmu(:import-from "C-CALL" "VOID" "C-STRING")
   #+sbcl(:import-from "SB-ALIEN" "VOID" "C-STRING")
+
+  ;; We override COMPUTE-EFFECTIVE-SLOT-DEFINITION-INITARGS for virtual slots
+  ;; and proxy classes.
+  #+(or cmu sbcl)
+  (:import-from
+   #+cmu"PCL" #+sbcl"SB-PCL"
+   "COMPUTE-EFFECTIVE-SLOT-DEFINITION-INITARGS")
+
   ;; Symbols from memory.lisp
   (:export "MAKE-POINTER" "POINTER-ADDRESS" "NULL-POINTER-P" "POINTER=" 
           "POINTER+" "REF-POINTER" 
@@ -58,7 +60,7 @@
           "DEFINE-CALLBACK" "CALLBACK" "CALLBACK-ADDRESS"
           "DEFINE-TYPE-GENERIC" "DEFINE-TYPE-METHOD" "IN-ARG-P" "OUT-ARG-P"
           "DEFAULT-ALIEN-TYPE-NAME" "DEFAULT-TYPE-NAME" "TYPE-EXPAND" 
-          "TYPE-EXPAND-1" "TYPE-EXPAND-TO")
+          "TYPE-EXPAND-1" "TYPE-EXPAND-TO" "TYPE-EQUAL-P")
   ;; Symbols from basic-types.lisp
   (:export "LONG" "UNSIGNED-LONG" "INT" "UNSIGNED-INT" "SHORT" "UNSIGNED-SHORT"
           "SIGNED" "UNSIGNED" "CHAR" "POINTER" "BOOL" "COPY-OF" "STATIC"