X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Faggregates.cl;h=64a0e281f543409e4577479e5deff9b2ff748697;hb=0e2874cd053926b5687403d7a824f8eea28f847b;hp=b0438d9a4c501e9756b3113ae71e2d7ce1f50479;hpb=192193db6e4fbda90a840474d4aa2e8762597927;p=uffi.git

diff --git a/src/aggregates.cl b/src/aggregates.cl
index b0438d9..64a0e28 100644
--- a/src/aggregates.cl
+++ b/src/aggregates.cl
@@ -9,7 +9,7 @@
 ;;;;
 ;;;; Copyright (c) 2002 Kevin M. Rosenberg
 ;;;;
-;;;; $Id: aggregates.cl,v 1.1 2002/03/09 19:55:33 kevin Exp $
+;;;; $Id: aggregates.cl,v 1.3 2002/03/10 22:29:47 kevin Exp $
 ;;;;
 ;;;; This file is part of the UFFI. 
 ;;;;
@@ -62,7 +62,7 @@ of the enum-name name, separator-string, and field-name"
 (defmacro def-array (name-array type)
   #+allegro
   `(ff:def-foreign-type ,name-array 
-       (:struct (:my-field (:array ,(convert-from-uffi-type type :array)))))
+       (:array ,(convert-from-uffi-type type :array)))
   #+lispworks
   `(fli:define-c-typedef ,name-array
        (:pointer (:pointer ,(convert-from-uffi-type type :array))))
@@ -95,7 +95,7 @@ of the enum-name name, separator-string, and field-name"
   )
 
 
-(defmacro get-slot-value (obj slot type)
+(defmacro get-slot-value (obj type slot)
   #+(or lispworks cmu) (declare (ignore type))
   #+allegro
   `(ff:fslot-value-typed ,type :c ,obj ,slot)
@@ -105,7 +105,7 @@ of the enum-name name, separator-string, and field-name"
   `(alien:slot ,obj ,slot)
   )
 
-(defmacro get-slot-pointer (obj slot type)
+(defmacro get-slot-pointer (obj type slot)
   #+(or lispworks cmu) (declare (ignore type))
   #+allegro
   `(ff:fslot-value-typed ,type :c ,obj ,slot)
@@ -115,12 +115,12 @@ of the enum-name name, separator-string, and field-name"
   `(alien:slot ,obj ,slot)
   )
 
-(defmacro deref-array (obj i type)
+(defmacro deref-array (obj type i)
   "Returns a field from a row"
   #+(or lispworks cmu) (declare (ignore type))
   #+cmu  `(alien:deref ,obj ,i)
   #+lispworks `(fli:dereference ,obj :index ,i)
-  #+allegro `(ff:fslot-value-typed ,type :c ,obj ':my-field ,i)
+  #+allegro `(ff:fslot-value-typed ,type :c ,obj ,i)
   )