r3626: external format fixes

diff --git a/debian/changelog b/debian/changelog
index 1df933a6cc616b2f34b22f420070ac85c814fd73..909f9d2f68043c16d68924455f6c99d04d1b2569 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+cl-uffi (1.2.3-1) unstable; urgency=low
+
+  * More external format changes for lispworks (thanks Marc Battyani)
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Fri, 13 Dec 2002 15:46:23 -0700
+
+cl-uffi (1.2.2-1) unstable; urgency=low
+
+  * Add external format parameters to lispworks to avoid translating stringsl
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Fri, 13 Dec 2002 14:26:17 -0700
+
 cl-uffi (1.2.1-1) unstable; urgency=low
 
   * Add uncompression test

diff --git a/src/primitives.lisp b/src/primitives.lisp
index 8ba2ba67e02217f17e417f94faef0c43f4662987..06dd03058dbf800194cc61084781a60d6e290924 100644 (file)
--- 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.6 2002/11/23 18:01:57 kevin Exp $
+;;;; $Id: primitives.lisp,v 1.7 2002/12/13 22:49:09 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -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)

diff --git a/src/strings.lisp b/src/strings.lisp
index 02ae84bfa1758412f690918d6290633bba04ae1b..2712a7355ce3ec389880367aa26d6910119f3759 100644 (file)
--- a/src/strings.lisp
+++ b/src/strings.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: strings.lisp,v 1.4 2002/10/16 11:56:43 kevin Exp $
+;;;; $Id: strings.lisp,v 1.5 2002/12/13 22:49:09 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -97,8 +97,8 @@ that LW/CMU automatically converts strings from c-calls."
 (defmacro convert-to-foreign-string (obj)
   #+lispworks
   `(if (null ,obj)
-       +null-cstring-pointer+
-    (fli:convert-to-foreign-string ,obj))
+    +null-cstring-pointer+
+    (fli:convert-to-foreign-string ,obj :external-format '(:latin-1 :eol-style :lf)))
   #+allegro
   `(if (null ,obj)
        0