From c28c2fe540ec9dac832390a74c4fb7a29cf806a8 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 14 Oct 2002 04:15:02 +0000 Subject: [PATCH] r3004: more sbcl changes --- src/aggregates.lisp | 10 +++++----- src/primitives.lisp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/aggregates.lisp b/src/aggregates.lisp index bb183cf..a233d1d 100644 --- a/src/aggregates.lisp +++ b/src/aggregates.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: aggregates.lisp,v 1.2 2002/10/14 01:51:15 kevin Exp $ +;;;; $Id: aggregates.lisp,v 1.3 2002/10/14 04:15:02 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -45,7 +45,7 @@ of the enum-name name, separator-string, and field-name" #+allegro `((ff:def-foreign-type ,enum-name :int)) #+lispworks `((fli:define-c-typedef ,enum-name :int)) #+cmu `((alien:def-alien-type ,enum-name alien:signed)) - #+sbcl `((sb-alien:def-alien-type ,enum-name sb-alien:signed)) + #+sbcl `((sb-alien:define-alien-type ,enum-name sb-alien:signed)) #+(and mcl (not openmcl)) `((def-mcl-type ,enum-name :integer)) #+openmcl `((ccl::def-foreign-type ,enum-name :int)) (nreverse constants))) @@ -63,7 +63,7 @@ of the enum-name name, separator-string, and field-name" `(alien:def-alien-type ,name-array (* ,(convert-from-uffi-type type :array))) #+sbcl - `(sb-alien:def-alien-type ,name-array + `(sb-alien:define-alien-type ,name-array (* ,(convert-from-uffi-type type :array))) #+(and mcl (not openmcl)) `(def-mcl-type ,name-array '(:array ,type)) @@ -93,7 +93,7 @@ of the enum-name name, separator-string, and field-name" #+cmu `(alien:def-alien-type ,name (alien:struct ,name ,@(process-struct-fields name fields))) #+sbcl - `(sb-alien:def-alien-type ,name (sb-alien:struct ,name ,@(process-struct-fields name fields))) + `(sb-alien:define-alien-type ,name (sb-alien:struct ,name ,@(process-struct-fields name fields))) #+allegro `(ff:def-foreign-type ,name (:struct ,@(process-struct-fields name fields))) #+lispworks @@ -196,7 +196,7 @@ of the enum-name name, separator-string, and field-name" #+cmu `(alien:def-alien-type ,name (alien:union ,name ,@(process-struct-fields name fields))) #+sbcl - `(sb-alien:def-alien-type ,name (sb-alien:union ,name ,@(process-struct-fields name fields))) + `(sb-alien:define-alien-type ,name (sb-alien:union ,name ,@(process-struct-fields name fields))) #+(and mcl (not openmcl)) `(ccl:defrecord ,name (:variant ,@(process-struct-fields name fields t))) #+openmcl diff --git a/src/primitives.lisp b/src/primitives.lisp index 0133de3..1b210fd 100644 --- a/src/primitives.lisp +++ b/src/primitives.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: primitives.lisp,v 1.3 2002/10/14 01:51:15 kevin Exp $ +;;;; $Id: primitives.lisp,v 1.4 2002/10/14 04:15:02 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -70,7 +70,7 @@ supports takes advantage of this optimization." #+lispworks `(fli:define-c-typedef ,name ,(convert-from-uffi-type type :type)) #+allegro `(ff:def-foreign-type ,name ,(convert-from-uffi-type type :type)) #+cmu `(alien:def-alien-type ,name ,(convert-from-uffi-type type :type)) - #+sbcl `(sb-alien:def-alien-type ,name ,(convert-from-uffi-type type :type)) + #+sbcl `(sb-alien:define-alien-type ,name ,(convert-from-uffi-type type :type)) #+cormanlisp `(ct:defctype ,name ,(convert-from-uffi-type type :type)) #+mcl (let ((mcl-type (convert-from-uffi-type type :type))) -- 2.34.1