r5053: *** empty log message ***

[clsql.git] / uffi / clsql-uffi.lisp

diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp
index 2f55de39be750fc76a1fcf4311f0eeb97324270b..fabf38ab61bee0c871acae61bc00bb710fe1e88f 100644 (file)
--- a/uffi/clsql-uffi.lisp
+++ b/uffi/clsql-uffi.lisp
@@ -1,4 +1,4 @@
-l;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
@@ -7,7 +7,7 @@ l;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: clsql-uffi.lisp,v 1.24 2003/05/17 07:52:21 kevin Exp $
+;;;; $Id: clsql-uffi.lisp,v 1.28 2003/05/29 05:19:50 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,8 +16,7 @@ l;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :clsql-uffi)
+(in-package #:clsql-uffi)
 
 
 (defun canonicalize-type-list (types auto-list)
@@ -95,7 +94,7 @@ l;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
   (declare (type char-ptr-def char-ptr))
   (let ((char (uffi:ensure-char-character
               (uffi:deref-pointer char-ptr :char))))
-    (eql char #\N)))
+    (char-equal char #\N)))
     
 (defun convert-raw-field (char-ptr types index)
   (let ((type (if (listp types)
@@ -120,15 +119,15 @@ l;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
                  low32
                  (make-64-bit-integer high32 low32)))))
         (t
-         #+allegro (native-to-string char-ptr) ;; optimized
-         #-allegro (uffi:convert-from-foreign-string char-ptr)))))))
+         #+(or allegro lispworks) (native-to-string char-ptr) ;; optimized
+         #-(or allegro lispworks) (uffi:convert-from-foreign-string char-ptr)))))))
   
 
 (uffi:def-function "strlen"
     ((str (* :unsigned-char)))
   :returning :unsigned-int)
 
-#+(and allegro ics)
+#+(or lispworks (and allegro ics))
 (defun native-to-string (s)
   (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
           (type char-ptr-def s))
@@ -144,7 +143,7 @@ l;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
       (incf i))
     str))
 
-#-(and allegro ics)
+#+(and allegro (not ics))
 (defun native-to-string (s)
   (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
           (type char-ptr-def s))
@@ -166,6 +165,3 @@ l;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
        (uffi:deref-array s '(:array :unsigned-char) i))
       (incf i))
     str))
-
-
-