From: Kevin M. Rosenberg Date: Mon, 14 Aug 2006 04:26:22 +0000 (+0000) Subject: r11022: revert incorrect stuff from clisp testing X-Git-Tag: v1.6.1~17 X-Git-Url: http://git.kpe.io/?p=uffi.git;a=commitdiff_plain;h=cc7b3da48f78a00cf62737f447ef9fe05a79bc37 r11022: revert incorrect stuff from clisp testing --- diff --git a/src/objects.lisp b/src/objects.lisp index 1c4983c..67c9bcb 100644 --- a/src/objects.lisp +++ b/src/objects.lisp @@ -249,20 +249,12 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated." #+(or macosx darwinppc-target) (concatenate 'string "_" name) #-(or macosx darwinppc-target) name) -;; unchanged from main primitives.lisp -(defun make-lisp-name (name) - (let ((converted (substitute #\- #\_ name))) - (intern - #+uffi-case-sensitive converted - #+(and (not uffi-lowercase-reader) (not uffi-case-sensitive)) (string-upcase converted) - #+(and uffi-lowercase-reader (not uffi-case-sensitive)) (string-downcase converted)))) - (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) (make-lisp-name names) (second names))) #-allegro - (var-type (convert-uffi-type type :type))) + (var-type (convert-from-uffi-type type :type))) #+(or cmu scl) `(alien:def-alien-variable (,foreign-name ,lisp-name) ,var-type) #+sbcl