X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/b3e77b396e7413c91fadff6e57636b1c3d521890..86b47a485e46a06517008bb919bde5d78a339e4d:/gffi/defpackage.lisp

diff --git a/gffi/defpackage.lisp b/gffi/defpackage.lisp
index 439dbee..55b6390 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.8 2007-01-02 16:03:22 espen Exp $
+;; $Id: defpackage.lisp,v 1.13 2008-04-29 22:12:32 espen Exp $
 
 (defpackage "GFFI"
   (:use "COMMON-LISP" "AUTOEXPORT" "PKG-CONFIG" "CLG-UTILS")
@@ -46,10 +46,11 @@
   #+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 @@
 	   "READER-FUNCTION" "WRITER-FUNCTION" "GETTER-FUNCTION"
 	   "PEEK-FUNCTION" "DESTROY-FUNCTION" "UNBOUND-VALUE"
 	   "COPY-FUNCTION" "ASSERT-INLINED" "ASSERT-NOT-INLINED"
-	   "UTF8-LENGTH" "OPTIMIZED-DOUBLE-FLOAT")
+	   "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")
@@ -91,6 +97,6 @@
 	   "EFFECTIVE-ALIEN-SLOT-DEFINITION" 
 	   "DIRECT-VIRTUAL-ALIEN-SLOT-DEFINITION"
 	   "EFFECTIVE-VIRTUAL-ALIEN-SLOT-DEFINITION"
-	   "FOREIGN-SIZE" "REF" "UNREF"
+	   "FOREIGN-SIZE" "REF" "UNREF" "REF-COUNTED-OBJECT"
 	   "ENSURE-PROXY-INSTANCE" "MAKE-PROXY-INSTANCE"  "STRUCT" 
 	   "STRUCT-CLASS" "STATIC-STRUCT-CLASS" "INLINED" "ADJUST-OFFSET"))