r11022: revert incorrect stuff from clisp testing

diff --git a/src/objects.lisp b/src/objects.lisp
index 1c4983cdd166ca0cb0c3193d31c904beb2c90f1c..67c9bcbee0092a814c73a9ccabf24d5553f909ea 100644 (file)
--- 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