r3060: *** empty log message ***

[uffi.git] / src / aggregates.lisp

diff --git a/src/aggregates.lisp b/src/aggregates.lisp
index a233d1d4462d44bc30c9366e67ea10258c4dfb9b..848b735cb60968414f7d5bebaffe890a835cce01 100644 (file)
--- 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.3 2002/10/14 04:15:02 kevin Exp $
+;;;; $Id: aggregates.lisp,v 1.4 2002/10/16 11:56:43 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -44,7 +44,7 @@ of the enum-name name, separator-string, and field-name"
     (setf cmds (append '(progn)
                       #+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))
+                      #+(or cmu scl) `((alien:def-alien-type ,enum-name 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))
@@ -59,7 +59,7 @@ of the enum-name name, separator-string, and field-name"
   #+lispworks
   `(fli:define-c-typedef ,name-array
     (:c-array ,(convert-from-uffi-type type :array)))
-  #+cmu
+  #+(or cmu scl)
   `(alien:def-alien-type ,name-array 
     (* ,(convert-from-uffi-type type :array)))
   #+sbcl
@@ -78,10 +78,10 @@ of the enum-name name, separator-string, and field-name"
             (type (cadr field))
             (def (append (list field-name)
                          (if (eq type :pointer-self)
-                             #+cmu `((* (alien:struct ,name)))
+                             #+(or cmu scl) `((* (alien:struct ,name)))
                              #+sbcl `((* (sb-alien:struct ,name)))
                              #+mcl `((:* (:struct ,name)))
-                             #-(or cmu sbcl mcl) `((* ,name))
+                             #-(or cmu sbcl scl mcl) `((* ,name))
                              `(,(convert-from-uffi-type type :struct))))))
        (if variant
            (push (list def) processed)
@@ -90,7 +90,7 @@ of the enum-name name, separator-string, and field-name"
        
            
 (defmacro def-struct (name &rest fields)
-  #+cmu
+  #+(or cmu scl)
   `(alien:def-alien-type ,name (alien:struct ,name ,@(process-struct-fields name fields)))
   #+sbcl
   `(sb-alien:define-alien-type ,name (sb-alien:struct ,name ,@(process-struct-fields name fields)))
@@ -108,12 +108,12 @@ of the enum-name name, separator-string, and field-name"
 
 
 (defmacro get-slot-value (obj type slot)
-  #+(or lispworks cmu sbcl) (declare (ignore type))
+  #+(or lispworks cmu sbcl scl) (declare (ignore type))
   #+allegro
   `(ff:fslot-value-typed ,type :c ,obj ,slot)
   #+lispworks
   `(fli:foreign-slot-value ,obj ,slot)
-  #+cmu
+  #+(or cmu scl)
   `(alien:slot ,obj ,slot)
   #+sbcl
   `(sb-alien:slot ,obj ,slot)
@@ -130,12 +130,12 @@ of the enum-name name, separator-string, and field-name"
 
 
 (defmacro get-slot-pointer (obj type slot)
-  #+(or lispworks cmu sbcl) (declare (ignore type))
+  #+(or lispworks cmu sbcl scl) (declare (ignore type))
   #+allegro
   `(ff:fslot-value-typed ,type :c ,obj ,slot)
   #+lispworks
   `(fli:foreign-slot-pointer ,obj ,slot)
-  #+cmu
+  #+(or cmu scl)
   `(alien:slot ,obj ,slot)
   #+sbcl
   `(sb-alien:slot ,obj ,slot)
@@ -159,8 +159,8 @@ of the enum-name name, separator-string, and field-name"
 
 (defmacro deref-array (obj type i)
   "Returns a field from a row"
-  #+(or lispworks cmu sbcl) (declare (ignore type))
-  #+cmu  `(alien:deref ,obj ,i)
+  #+(or lispworks cmu sbcl scl) (declare (ignore type))
+  #+(or cmu scl)  `(alien:deref ,obj ,i)
   #+sbcl  `(sb-alien:deref ,obj ,i)
   #+lispworks `(fli:dereference ,obj :index ,i)
   #+allegro `(ff:fslot-value-typed (quote ,(convert-from-uffi-type type :type)) :c ,obj ,i)
@@ -193,7 +193,7 @@ of the enum-name name, separator-string, and field-name"
   `(ff:def-foreign-type ,name (:union ,@(process-struct-fields name fields)))
   #+lispworks
   `(fli:define-c-union ,name ,@(process-struct-fields name fields))
-  #+cmu
+  #+(or cmu scl)
   `(alien:def-alien-type ,name (alien:union ,name ,@(process-struct-fields name fields)))
   #+sbcl
   `(sb-alien:define-alien-type ,name (sb-alien:union ,name ,@(process-struct-fields name fields)))