X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=uffi%2Fclsql-uffi.lisp;h=1b6153b3f4ef54447958f4a50effb453595c97e7;hb=e512cb4708d197091317a2c7850a77710c1dda74;hp=38e4564b993cd25d112a80f6c1028779b987627c;hpb=af295fc3530f18d1b1d71998977ca15e48fe8b7b;p=clsql.git

diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp
index 38e4564..1b6153b 100644
--- a/uffi/clsql-uffi.lisp
+++ b/uffi/clsql-uffi.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: clsql-uffi.lisp,v 1.13 2003/05/16 08:51:00 kevin Exp $
+;;;; $Id: clsql-uffi.lisp,v 1.20 2003/05/16 18:53:57 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -146,7 +146,7 @@
       (incf i))
     str))
 
-#-allegro
+#+(and allegro ics)
 (defun native-to-string (s)
   (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
 	   (type char-ptr-def s))
@@ -162,43 +162,28 @@
       (incf i))
     str))
 
-#+allegro
-(excl:ics-target-case
- (:+ics
-  (defun native-to-string (s)
-    (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
-	     (type char-ptr-def s))
-    (let* ((len (strlen s))
-	   (str (make-string len)))
-      (declare (fixnum len)
-	       (simple-string str))
-      (do ((i 0))
-	  ((= i len))
-	(declare (fixnum i))
-	(setf (schar str i)
-	      (code-char (uffi:deref-array s '(:array :unsigned-char) i)))
-	(incf i))
-    str)))
- (:-ics
-  (defun native-to-string (s)
+#-(and allegro ics)
+(defun native-to-string (s)
   (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
 	   (type char-ptr-def s))
   (let* ((len (strlen s))
 	 (len4 (floor len 4))
 	 (str (make-string len)))
     (declare (fixnum len)
-	     (type (simple-array (unsigned-byte 32) (*)) str))
+	     (type (simple-array (signed-byte 32) (*)) str))
     (do ((i 0))
 	((= i len4))
       (declare (fixnum i))
-      (setf (aref (the (simple-array (unsigned-byte 32) (*)) str) i)
-	    (uffi:deref-array s '(:array :unsigned-int) i))
-      (incf i))
-    #+ignore
-    (do ((i (* 4 len4))
-	 (str1 str))
+      (setf (aref (the (simple-array (signed-byte 32) (*)) str) i)
+	(uffi:deref-array s '(:array :int) i))
+	(incf i))
+    (do ((i (* 4 len4)))
 	((= i len))
-      (declare (fixnum i) (type (simple-array (unsigned-byte 8) (*)) str1))
-      (setf (aref str1 i) (uffi:deref-array s '(:array :unsigned-char) i))
+      (declare (fixnum i))
+      (setf (aref (the (simple-array (signed-byte 8) (*)) str) i)
+	(uffi:deref-array s '(:array :unsigned-char) i))
       (incf i))
-    str))))
+    str))
+
+
+