r5062: return from san diego

[uffi.git] / src / primitives.lisp

diff --git a/src/primitives.lisp b/src/primitives.lisp
index dc91044d8cead83512ae03def4157a43fa98f23c..1af37b4f016102ebdc9024f2bd6a0b8f5daf5950 100644 (file)
--- a/src/primitives.lisp
+++ b/src/primitives.lisp
@@ -2,12 +2,12 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          primitives.cl
+;;;; Name:          primitives.lisp
 ;;;; Purpose:       UFFI source to handle immediate types
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: primitives.lisp,v 1.5 2002/10/16 11:56:43 kevin Exp $
+;;;; $Id: primitives.lisp,v 1.9 2003/06/06 21:59:18 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,8 +16,7 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :uffi)
+(in-package #:uffi)
 
 #+mcl
 (defvar *keyword-package* (find-package "KEYWORD"))
@@ -166,7 +165,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 +178,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)