chiark / gitweb /
Small fix for CLISP
[clg] / gffi / defpackage.lisp
index 082ebcc3a5f99a3de560e016bdbae5b2fc1fc921..619a897f3081d0af1a97ee1381f3f0c494672a00 100644 (file)
@@ -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.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" 
@@ -50,7 +50,7 @@ (defpackage "GFFI"
           "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"
@@ -74,7 +74,7 @@ (defpackage "GFFI"
           "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-REF-SINGLE-FLOAT" "UNBOXED-VECTOR")
   ;; Symbols from enums.lisp
   (:export "ENUM" "ENUM-INT" "INT-ENUM" "ENUM-MAPPING" "DEFINE-ENUM-TYPE"
           "FLAGS" "DEFINE-FLAGS-TYPE")