uffi/src objects.lisp,1.17,1.18 primitives.lisp,1.10,1.11

Update of /pubcvs/uffi/src
In directory boa.b9.com:/tmp/cvs-serv19613/src

Modified Files:
	objects.lisp primitives.lisp 
Log Message:


Index: primitives.lisp
===================================================================
RCS file: /pubcvs/uffi/src/primitives.lisp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** primitives.lisp	14 Aug 2003 21:40:13 -0000	1.10
--- primitives.lisp	14 Aug 2003 21:58:29 -0000	1.11
***************
*** 131,135 ****
  (setq *type-conversion-list*
      '((* . *) (:void . c-call:void) 
-       (:short . c-call:short)
        (:pointer-void . (* t))
        (:cstring . c-call:c-string)
--- 131,134 ----
***************
*** 138,142 ****
        (:byte . (alien:signed 8))
        (:unsigned-byte . (alien:unsigned 8))
!       (:short . c-call:unsigned-short) 
        (:unsigned-short . c-call:unsigned-short)
        (:int . alien:integer) (:unsigned-int . c-call:unsigned-int) 
--- 137,141 ----
        (:byte . (alien:signed 8))
        (:unsigned-byte . (alien:unsigned 8))
!       (:short . c-call:short)
        (:unsigned-short . c-call:unsigned-short)
        (:int . alien:integer) (:unsigned-int . c-call:unsigned-int) 
***************
*** 148,152 ****
  (setq *type-conversion-list*
      '((* . *) (:void . sb-alien:void) 
-       (:short . sb-alien:short)
        (:pointer-void . (* t))
        (:cstring . sb-alien:c-string)
--- 147,150 ----
***************
*** 155,159 ****
        (:byte . (sb-alien:signed 8))
        (:unsigned-byte . (sb-alien:unsigned 8))
!       (:short . sb-alien:unsigned-short) 
        (:unsigned-short . sb-alien:unsigned-short)
        (:int . sb-alien:integer) (:unsigned-int . sb-alien:unsigned-int) 
--- 153,157 ----
        (:byte . (sb-alien:signed 8))
        (:unsigned-byte . (sb-alien:unsigned 8))
!       (:short . sb-alien:short)
        (:unsigned-short . sb-alien:unsigned-short)
        (:int . sb-alien:integer) (:unsigned-int . sb-alien:unsigned-int) 

Index: objects.lisp
===================================================================
RCS file: /pubcvs/uffi/src/objects.lisp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** objects.lisp	14 Aug 2003 21:40:13 -0000	1.17
--- objects.lisp	14 Aug 2003 21:58:29 -0000	1.18
***************
*** 232,237 ****
    #-lispworks (declare (ignore module))
    (let ((foreign-name (if (atom names) names (first names)))
!         (lisp-name (if (atom names) (uffi::make-lisp-name names) (second names)))
!         (var-type (uffi::convert-from-uffi-type type :foreign-var)))
      #+(or cmu scl)
      `(alien:def-alien-variable (,foreign-name ,lisp-name) ,var-type)
--- 232,237 ----
    #-lispworks (declare (ignore module))
    (let ((foreign-name (if (atom names) names (first names)))
!         (lisp-name (if (atom names) (make-lisp-name names) (second names)))
!         (var-type (convert-from-uffi-type type :foreign-var)))
      #+(or cmu scl)
      `(alien:def-alien-variable (,foreign-name ,lisp-name) ,var-type)