Small fix for CLISP

[clg] / gffi / defpackage.lisp

diff --git a/gffi/defpackage.lisp b/gffi/defpackage.lisp
index b0c7b45b773eda17478347f59e6b88ba706c644b..619a897f3081d0af1a97ee1381f3f0c494672a00 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.10 2007-02-19 14:42:54 espen Exp $
+;; $Id: defpackage.lisp,v 1.14 2008-11-04 20:15:35 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,10 +46,11 @@ (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-BYTE" "REF-INT-32" "REF-UINT-32"
+          "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"
@@ -65,10 +66,15 @@ (defpackage "GFFI"
           "READER-FUNCTION" "WRITER-FUNCTION" "GETTER-FUNCTION"
           "PEEK-FUNCTION" "DESTROY-FUNCTION" "UNBOUND-VALUE"
           "COPY-FUNCTION" "ASSERT-INLINED" "ASSERT-NOT-INLINED"
-          "UTF8-LENGTH" "OPTIMIZED-DOUBLE-FLOAT" "POINTER-DATA")
+          "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-BYTE" "VECTOR-REF-INT-16"
+          "VECTOR-REF-UINT-16" "VECTOR-REF-INT-32" "VECTOR-REF-UINT-32"
+          "VECTOR-REF-INT-64" "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")