From 7612015bdcfa851374a4e8c6f3ff68a8dd8b9a9a Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Thu, 14 Aug 2003 21:58:44 +0000 Subject: [PATCH] r5498: *** empty log message *** --- src/objects.lisp | 6 +++--- src/primitives.lisp | 8 +++----- tests/foreign-var.lisp | 6 +++--- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/objects.lisp b/src/objects.lisp index 26d1672..4d86f1a 100644 --- a/src/objects.lisp +++ b/src/objects.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: objects.lisp,v 1.17 2003/08/14 21:40:13 kevin Exp $ +;;;; $Id: objects.lisp,v 1.18 2003/08/14 21:58:29 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -231,8 +231,8 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated." (defmacro def-foreign-var (names type module) #-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))) + (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) #+sbcl diff --git a/src/primitives.lisp b/src/primitives.lisp index 2bc63c2..1e860fb 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.10 2003/08/14 21:40:13 kevin Exp $ +;;;; $Id: primitives.lisp,v 1.11 2003/08/14 21:58:29 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -130,14 +130,13 @@ supports takes advantage of this optimization." #+(or cmu scl) (setq *type-conversion-list* '((* . *) (:void . c-call:void) - (:short . c-call:short) (:pointer-void . (* t)) (:cstring . c-call:c-string) (:char . c-call:char) (:unsigned-char . (alien:unsigned 8)) (:byte . (alien:signed 8)) (:unsigned-byte . (alien:unsigned 8)) - (:short . c-call:unsigned-short) + (:short . c-call:short) (:unsigned-short . c-call:unsigned-short) (:int . alien:integer) (:unsigned-int . c-call:unsigned-int) (:long . c-call:long) (:unsigned-long . c-call:unsigned-long) @@ -147,14 +146,13 @@ supports takes advantage of this optimization." #+sbcl (setq *type-conversion-list* '((* . *) (:void . sb-alien:void) - (:short . sb-alien:short) (:pointer-void . (* t)) (:cstring . sb-alien:c-string) (:char . sb-alien:char) (:unsigned-char . (sb-alien:unsigned 8)) (:byte . (sb-alien:signed 8)) (:unsigned-byte . (sb-alien:unsigned 8)) - (:short . sb-alien:unsigned-short) + (:short . sb-alien:short) (:unsigned-short . sb-alien:unsigned-short) (:int . sb-alien:integer) (:unsigned-int . sb-alien:unsigned-int) (:long . sb-alien:long) (:unsigned-long . sb-alien:unsigned-long) diff --git a/tests/foreign-var.lisp b/tests/foreign-var.lisp index 08a6e95..e0c3235 100644 --- a/tests/foreign-var.lisp +++ b/tests/foreign-var.lisp @@ -7,14 +7,14 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2003 ;;;; -;;;; $Id: foreign-var.lisp,v 1.1 2003/08/14 21:40:13 kevin Exp $ +;;;; $Id: foreign-var.lisp,v 1.2 2003/08/14 21:58:44 kevin Exp $ ;;;; ;;;; ************************************************************************* (in-package #:uffi-tests) -(def-foreign-var "uchar_13" :char "uffi_tests") -(def-foreign-var "schar_neg_120" :char "uffi_tests") +(def-foreign-var "uchar_13" :unsigned-byte "uffi_tests") +(def-foreign-var "schar_neg_120" :byte "uffi_tests") (def-foreign-var "uword_257" :unsigned-short "uffi_tests") (def-foreign-var "sword_neg_321" :short "uffi_tests") (def-foreign-var "uint_1234567" :int "uffi_tests") -- 2.34.1