X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fprimitives.cl;h=c113bdfd6156d12aa3520226d2abf60a782a8266;hb=e1ba5e8ff148275ed252b179f43a4b045c1dcaf6;hp=0048668d9779c1bd0289c9d4a6c2efcb03021950;hpb=fb93b1923db347f01bdebc7226e5e1eaacacc9f9;p=uffi.git diff --git a/src/primitives.cl b/src/primitives.cl index 0048668..c113bdf 100644 --- a/src/primitives.cl +++ b/src/primitives.cl @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: primitives.cl,v 1.8 2002/03/17 17:33:30 kevin Exp $ +;;;; $Id: primitives.cl,v 1.10 2002/03/18 22:47:57 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -37,11 +37,8 @@ supports takes advantage of this optimization." ) (defmacro null-char-p (val) - `(if (or (eql ,val 0) - (eq ,val #\Null)) - t - nil)) - + "Returns T if character is NULL" + `(zerop ,val)) (defmacro def-foreign-type (name type) #+lispworks `(fli:define-c-typedef ,name ,(convert-from-uffi-type type :type)) @@ -78,7 +75,8 @@ supports takes advantage of this optimization." (:char . c-call:char) (:unsigned-char . (alien:unsigned 8)) (:byte . (alien:unsigned 8)) - (:short . c-call:unsigned-short) (:unsigned-short c-call:unsigned-short) + (:short . c-call:unsigned-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) (:float . c-call:float) (:double . c-call:double)