Minor changes for win32

[clg] / gffi / defpackage.lisp

diff --git a/gffi/defpackage.lisp b/gffi/defpackage.lisp
index feb03b5d2dab193a21343914138f1bbb547ac2ec..bd02e70b441e6c142c20d35f6e3e6b8c6919e27b 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.
 
 ;; 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.2 2006/06/08 13:24:25 espen Exp $
+;; $Id: defpackage.lisp,v 1.11 2007/06/02 07:26:24 espen Exp $

 
 (defpackage "GFFI"
   (:use "COMMON-LISP" "AUTOEXPORT" "PKG-CONFIG" "CLG-UTILS")
 
 (defpackage "GFFI"
   (:use "COMMON-LISP" "AUTOEXPORT" "PKG-CONFIG" "CLG-UTILS")


@@ -46,9 +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=" 
   #+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"
           "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"
   ;; Symbols from interface.lisp
   (:export "DEFBINDING" "MKBINDING" "USE-PREFIX" "PACKAGE-PREFIX" 
           "DEFINE-CALLBACK" "CALLBACK" "CALLBACK-ADDRESS"


@@ -63,7 +65,8 @@ (defpackage "GFFI"
           "CALLBACK-WRAPPER" "TO-ALIEN-FUNCTION" "FROM-ALIEN-FUNCTION" 
           "READER-FUNCTION" "WRITER-FUNCTION" "GETTER-FUNCTION"
           "PEEK-FUNCTION" "DESTROY-FUNCTION" "UNBOUND-VALUE"
           "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")
   ;; Symbols from vector.lisp
   (:export "MAKE-C-VECTOR" "MAP-C-VECTOR" "WITH-C-VECTOR" "COUNTED-VECTOR"
           "NULL-TERMINATED-VECTOR")


@@ -78,7 +81,7 @@ (defpackage "GFFI"
           "COMPUTE-EFFECTIVE-SLOT-DEFINITION-INITARGS" "BOUNDP-FUNCTION"
           "COMPUTE-SLOT-READER-FUNCTION" "COMPUTE-SLOT-BOUNDP-FUNCTION"
           "COMPUTE-SLOT-WRITER-FUNCTION" "COMPUTE-SLOT-MAKUNBOUND-FUNCTION"
           "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" 
   ;; Symbols from proxy.lisp  
   (:export "CACHE-INSTANCE" "FIND-CACHED-INSTANCE" "LIST-CACHED-INSTANCES"
            "REMOVE-CACHED-INSTANCE" "PROXY" "INSTANCE-FINALIZER" 


@@ -86,6 +89,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"
           "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" 
           "ENSURE-PROXY-INSTANCE" "MAKE-PROXY-INSTANCE"  "STRUCT" 

-          "STRUCT-CLASS" "STATIC-STRUCT-CLASS" "INLINED"))
+          "STRUCT-CLASS" "STATIC-STRUCT-CLASS" "INLINED" "ADJUST-OFFSET"))