X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/b286c6ed2b306af55fc67fff532136418a70c73f..7ecf52b3a8b7814e8d3301262e957d49bce61198:/gffi/defpackage.lisp

diff --git a/gffi/defpackage.lisp b/gffi/defpackage.lisp
index 68cf044..b0c7b45 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.1 2006-04-25 20:29:14 espen Exp $
+;; $Id: defpackage.lisp,v 1.10 2007-02-19 14:42:54 espen Exp $
 
 (defpackage "GFFI"
   (:use "COMMON-LISP" "AUTOEXPORT" "PKG-CONFIG" "CLG-UTILS")
@@ -48,7 +48,8 @@
   (:export "MAKE-POINTER" "POINTER-ADDRESS" "NULL-POINTER-P" "POINTER=" 
 	   "POINTER+" "REF-POINTER" "REF-BYTE" "ALLOCATE-MEMORY"
 	   "DEALLOCATE-MEMORY" "COPY-MEMORY" "CLEAR-MEMORY" "MEMORY-CLEAR-P"
-	   "WITH-MEMORY" "WITH-POINTER")
+	   "WITH-MEMORY" "WITH-POINTER" "*MEMORY-ALLOCATOR*" 
+	   "*MEMORY-DEALLOCATOR*")
   ;; Symbols from interface.lisp
   (:export "DEFBINDING" "MKBINDING" "USE-PREFIX" "PACKAGE-PREFIX" 
 	   "DEFINE-CALLBACK" "CALLBACK" "CALLBACK-ADDRESS"
@@ -56,14 +57,15 @@
 	   "DEFAULT-ALIEN-TYPE-NAME" "DEFAULT-TYPE-NAME" "TYPE-EXPAND" 
 	   "TYPE-EXPAND-1" "TYPE-EXPAND-TO")
   ;; Symbols from basic-types.lisp
-  (:export "LONG" "UNSIGNED-LONG" "INT" "UNSIGNED-INT" "SHORT" 
-	   "UNSIGNED-SHORT" "SIGNED" "UNSIGNED" "CHAR" "POINTER"
-	   "BOOL" "COPY-OF" "STATIC" "SIZE-OF" "ALIEN-TYPE" "UNBOUND-VALUE"
+  (:export "LONG" "UNSIGNED-LONG" "INT" "UNSIGNED-INT" "SHORT" "UNSIGNED-SHORT"
+	   "SIGNED" "UNSIGNED" "CHAR" "POINTER" "BOOL" "COPY-OF" "STATIC" 
+	   "SIZE-OF" "TYPE-ALIGNMENT" "ALIEN-TYPE" "UNBOUND-VALUE" 
 	   "ALIEN-ARG-WRAPPER" "TO-ALIEN-FORM" "FROM-ALIEN-FORM"
 	   "CALLBACK-WRAPPER" "TO-ALIEN-FUNCTION" "FROM-ALIEN-FUNCTION" 
 	   "READER-FUNCTION" "WRITER-FUNCTION" "GETTER-FUNCTION"
 	   "PEEK-FUNCTION" "DESTROY-FUNCTION" "UNBOUND-VALUE"
-	   "COPY-FUNCTION" "ASSERT-INLINED" "ASSERT-NOT-INLINED")
+	   "COPY-FUNCTION" "ASSERT-INLINED" "ASSERT-NOT-INLINED"
+	   "UTF8-LENGTH" "OPTIMIZED-DOUBLE-FLOAT" "POINTER-DATA")
   ;; Symbols from vector.lisp
   (:export "MAKE-C-VECTOR" "MAP-C-VECTOR" "WITH-C-VECTOR" "COUNTED-VECTOR"
 	   "NULL-TERMINATED-VECTOR")
@@ -78,7 +80,7 @@
 	   "COMPUTE-EFFECTIVE-SLOT-DEFINITION-INITARGS" "BOUNDP-FUNCTION"
 	   "COMPUTE-SLOT-READER-FUNCTION" "COMPUTE-SLOT-BOUNDP-FUNCTION"
 	   "COMPUTE-SLOT-WRITER-FUNCTION" "COMPUTE-SLOT-MAKUNBOUND-FUNCTION"
-	   #+clisp"SLOT-DEFINITION-TYPE")
+	   "SLOT-READABLE-P" "SLOT-WRITABLE-P" #+clisp"SLOT-DEFINITION-TYPE")
   ;; Symbols from proxy.lisp  
   (:export "CACHE-INSTANCE" "FIND-CACHED-INSTANCE" "LIST-CACHED-INSTANCES"
            "REMOVE-CACHED-INSTANCE" "PROXY" "INSTANCE-FINALIZER" 
@@ -86,6 +88,9 @@
 	   "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"))
+	   "STRUCT-CLASS" "STATIC-STRUCT-CLASS" "INLINED" "ADJUST-OFFSET"))