X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/2c708568813055419a75f313819c8b3e94f32932..265833ead03e4b774ceefe1688594f3b21015e22:/gffi/defpackage.lisp

diff --git a/gffi/defpackage.lisp b/gffi/defpackage.lisp
index 082ebcc..4fdde99 100644
--- 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.12 2007-09-07 07:28:42 espen Exp $
+;; $Id: defpackage.lisp,v 1.15 2008-11-06 17:26:53 espen Exp $
 
 (defpackage "GFFI"
   (:use "COMMON-LISP" "AUTOEXPORT" "PKG-CONFIG" "CLG-UTILS")
@@ -29,7 +29,7 @@
   #+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,11 +46,13 @@
   #+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" "REF-INT-32" "REF-UINT-32"
+	   "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"
@@ -71,10 +73,10 @@
   ;; Symbols from vector.lisp
   (:export "MAKE-C-VECTOR" "MAP-C-VECTOR" "WITH-C-VECTOR" "COUNTED-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")
+	   "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")