X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fprimitives.lisp;h=03530669ff87ed7cfc31f3756d07f6f9445bd769;hb=6f8fd4b148031341829086bc663bad4143317d59;hp=1b210fd86e553eaf4073128fa0f1980de868a2ae;hpb=c28c2fe540ec9dac832390a74c4fb7a29cf806a8;p=uffi.git

diff --git a/src/primitives.lisp b/src/primitives.lisp
index 1b210fd..0353066 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.4 2002/10/14 04:15:02 kevin Exp $
+;;;; $Id: primitives.lisp,v 1.8 2002/12/15 17:11:08 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -56,7 +56,7 @@
 supports takes advantage of this optimization."
   #+(or lispworks allegro mcl cormanlisp)  (declare (ignore type))
   #+(or lispworks allegro mcl cormanlisp) `(deftype ,name () t)
-  #+cmu
+  #+(or cmu scl)
   `(deftype ,name () '(alien:alien ,(convert-from-uffi-type type :declare)))
   #+sbcl
   `(deftype ,name () '(sb-alien:alien ,(convert-from-uffi-type type :declare)))
@@ -69,7 +69,7 @@ supports takes advantage of this optimization."
 (defmacro def-foreign-type (name type)
   #+lispworks `(fli:define-c-typedef ,name ,(convert-from-uffi-type type :type))
   #+allegro `(ff:def-foreign-type ,name ,(convert-from-uffi-type type :type))
-  #+cmu `(alien:def-alien-type ,name ,(convert-from-uffi-type type :type))
+  #+(or cmu scl) `(alien:def-alien-type ,name ,(convert-from-uffi-type type :type))
   #+sbcl `(sb-alien:define-alien-type ,name ,(convert-from-uffi-type type :type))
   #+cormanlisp `(ct:defctype ,name ,(convert-from-uffi-type type :type))
   #+mcl
@@ -84,13 +84,13 @@ supports takes advantage of this optimization."
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defvar +type-conversion-hash+ (make-hash-table :size 20))
-  #+(or cmu sbcl) (defvar *cmu-def-type-hash* (make-hash-table :size 20))
+  #+(or cmu sbcl scl) (defvar *cmu-def-type-hash* (make-hash-table :size 20))
   )
 
-#+(or cmu sbcl)
+#+(or cmu sbcl scl)
 (defparameter *cmu-sbcl-def-type-list* nil)
 
-#+cmu
+#+(or cmu scl)
 (defparameter *cmu-sbcl-def-type-list*
     '((:char . (alien:signed 8))
       (:unsigned-char . (alien:unsigned 8))
@@ -125,7 +125,7 @@ supports takes advantage of this optimization."
 
 (defparameter *type-conversion-list* nil)
 
-#+cmu
+#+(or cmu scl)
 (setq *type-conversion-list*
     '((* . *) (:void . c-call:void) 
       (:short . c-call:short)
@@ -166,7 +166,7 @@ supports takes advantage of this optimization."
       (:pointer-void . (* :void))
       (:cstring . (* :unsigned-char))
       (:byte . :char)
-      (:unsigned-byte . :unsigned-byte)
+      (:unsigned-byte . :unsigned-char)
       (:char . :char)
       (:unsigned-char . :unsigned-char)
       (:int . :int) (:unsigned-int . :unsigned-int) 
@@ -179,9 +179,12 @@ supports takes advantage of this optimization."
     '((* . :pointer) (:void . :void) 
       (:short . :short)
       (:pointer-void . (:pointer :void))
-      (:cstring . (:reference-pass (:ef-mb-string :external-format :latin-1)
-				   :allow-null t))
-      (:cstring-returning . (:reference (:ef-mb-string :external-format :latin-1) :allow-null t))
+      (:cstring . (:reference-pass (:ef-mb-string :external-format
+				    (:latin-1 :eol-style :lf))
+		   :allow-null t))
+      (:cstring-returning . (:reference (:ef-mb-string :external-format
+					 (:latin-1 :eol-style :lf))
+			     :allow-null t))
       (:byte . :byte)
       (:unsigned-byte . (:unsigned :byte))
       (:char . :char)
@@ -223,7 +226,7 @@ supports takes advantage of this optimization."
 (dolist (type *type-conversion-list*)
   (setf (gethash (car type) +type-conversion-hash+) (cdr type)))
 
-#+(or cmu sbcl)
+#+(or cmu sbcl scl)
 (dolist (type *cmu-sbcl-def-type-list*)
   (setf (gethash (car type) *cmu-def-type-hash*) (cdr type)))
 
@@ -242,7 +245,7 @@ supports takes advantage of this optimization."
        ((and (or (eq context :routine) (eq context :return))
 	     (eq type :cstring))
 	(setq type '((* :char) integer)))
-       #+(or cmu sbcl)
+       #+(or cmu sbcl scl)
        ((eq context :type)
 	(let ((cmu-type (gethash type *cmu-def-type-hash*)))
 	  (if cmu-type