Fix compilation for Gtk with the new, stricter inheritance

[clg] / gffi / defpackage.lisp

diff --git a/gffi/defpackage.lisp b/gffi/defpackage.lisp
index 6eb9c554a7090d70812ed7dbed654575cb5a0fa4..1560ea157eb8e4392c6055f16b3f6fb08df6c9d3 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.6 2006-12-21 16:38:19 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")
@@ -29,7 +29,7 @@ (defpackage "GFFI"
   #+clisp(:use "CLOS" "EXT")
   #+(or cmu sbcl)(:shadow "POINTER")
   #+cmu(:shadowing-import-from "PCL" "CLASS-DIRECT-SUPERCLASSES")
-  #+clisp(:shadow "TYPE-EXPAND-1" "SLOT-DEFINITION-TYPE")
+  #+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" 
@@ -46,16 +46,19 @@ (defpackage "GFFI"
   #+sbcl(:import-from "SB-ALIEN" "VOID" "C-STRING")
   ;; Symbols from memory.lisp
   (:export "MAKE-POINTER" "POINTER-ADDRESS" "NULL-POINTER-P" "POINTER=" 
-          "POINTER+" "REF-POINTER" "REF-BYTE" "ALLOCATE-MEMORY"
+          "POINTER+" "REF-POINTER" 
+          "REF-INT-8" "REF-INT-16" "REF-INT-32" "REF-INT-64"
+          "REF-UINT-8" "REF-UINT-16" "REF-UINT-32" "REF-UINT-64"
+          "REF-DOUBLE-FLOAT" "REF-SINGLE-FLOAT" "ALLOCATE-MEMORY"
           "DEALLOCATE-MEMORY" "COPY-MEMORY" "CLEAR-MEMORY" "MEMORY-CLEAR-P"
           "WITH-MEMORY" "WITH-POINTER" "*MEMORY-ALLOCATOR*" 
-          "*MEMORY-DEALLOCATOR*")
+          "*MEMORY-DEALLOCATOR*" #+cmu"WITH-PINNED-OBJECTS")
   ;; Symbols from interface.lisp
   (:export "DEFBINDING" "MKBINDING" "USE-PREFIX" "PACKAGE-PREFIX" 
           "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" 
@@ -65,10 +68,15 @@ (defpackage "GFFI"
           "READER-FUNCTION" "WRITER-FUNCTION" "GETTER-FUNCTION"
           "PEEK-FUNCTION" "DESTROY-FUNCTION" "UNBOUND-VALUE"
           "COPY-FUNCTION" "ASSERT-INLINED" "ASSERT-NOT-INLINED"
-          "UTF8-LENGTH")
+          "UTF8-LENGTH" "OPTIMIZED-DOUBLE-FLOAT" "POINTER-DATA"
+          "ARGUMENT-TYPE" "RETURN-TYPE")
   ;; Symbols from vector.lisp
   (:export "MAKE-C-VECTOR" "MAP-C-VECTOR" "WITH-C-VECTOR" "COUNTED-VECTOR"
-          "NULL-TERMINATED-VECTOR")
+          "NULL-TERMINATED-VECTOR" "VECTOR-READER-FUNCTION"
+          "VECTOR-WRITER-FUNCTION" "VECTOR-REF-INT-8" "VECTOR-REF-INT-16"
+          "VECTOR-REF-UINT-8" "VECTOR-REF-UINT-16" "VECTOR-REF-UINT-32" 
+          "VECTOR-REF-UINT-64" "VECTOR-REF-DOUBLE-FLOAT" 
+          "VECTOR-REF-SINGLE-FLOAT" "UNBOXED-VECTOR")
   ;; Symbols from enums.lisp
   (:export "ENUM" "ENUM-INT" "INT-ENUM" "ENUM-MAPPING" "DEFINE-ENUM-TYPE"
           "FLAGS" "DEFINE-FLAGS-TYPE")
@@ -88,6 +96,9 @@ (defpackage "GFFI"
           "ALLOCATE-FOREIGN" "FOREIGN-LOCATION" "PROXY-VALID-P" 
           "MOST-SPECIFIC-PROXY-SUPERCLASS" "DIRECT-PROXY-SUPERCLASS"
           "PROXY-CLASS" "FOREIGN-SIZE-P" "DIRECT-ALIEN-SLOT-DEFINITION"
-          "EFFECTIVE-ALIEN-SLOT-DEFINITION" "FOREIGN-SIZE" "REF" "UNREF"
+          "EFFECTIVE-ALIEN-SLOT-DEFINITION" 
+          "DIRECT-VIRTUAL-ALIEN-SLOT-DEFINITION"
+          "EFFECTIVE-VIRTUAL-ALIEN-SLOT-DEFINITION"
+          "FOREIGN-SIZE" "REF" "UNREF" "REF-COUNTED-OBJECT"
           "ENSURE-PROXY-INSTANCE" "MAKE-PROXY-INSTANCE"  "STRUCT" 
           "STRUCT-CLASS" "STATIC-STRUCT-CLASS" "INLINED" "ADJUST-OFFSET"))