Changeset combined,8 for combined

Timestamp:

08/06/2008 03:19:22 AM (18 years ago)

Author:

David Owen <dsowen@…>

branch-nick:

combined

parents:

Rev	Tree	Chgset
7	@combined,7	[combined,7]
2.1.16	@combined,2.1.16	[combined,2.1.16]

revision id:

dsowen@fugue88.ws-20080806031922-a22y2c619mpmrf46

Message:

Merged from 64-bit

Location:

combined/src/odbc

Files:

• odbc-ff-interface.lisp (modified) (1 diff)
• odbc-functions.lisp (modified) (1 diff)
• parameter.lisp (modified) (3 diffs)

combined/src/odbc/odbc-ff-interface.lisp

@@ -32 +32 @@
 (defctype sql-u-len sql-u-integer)
 (defctype sql-return sql-small-int)
+(defctype sql-pointer-as-int
+    #.(ecase (foreign-type-size :pointer)
+        (1 :int8)
+        (2 :int16)
+        (4 :int32)
+        (8 :int64)))
 
 (defctype *sql-small-int :pointer)

combined/src/odbc/odbc-functions.lisp

@@ -69 +69 @@
        (error-code (cffi:foreign-alloc 'sql-integer))
        (msg-length (cffi:foreign-alloc 'sql-small-int)))
-    (SQLError henv hdbc hstmt sql-state error-code
+    (SQLError (or henv (null-pointer)) (or hdbc (null-pointer))
+              (or hstmt (null-pointer)) sql-state error-code
               error-message $SQL_MAX_MESSAGE_LENGTH msg-length)
     (get-string sql-state 5)          ;(%cstring-to-keyword sql-state)

combined/src/odbc/parameter.lisp

@@ -353 +353 @@
       (progn
         (setf (slot-value param 'temp-val) value)
-        (setf (cffi:mem-ref (slot-value param 'value-ptr) :long)
+        (setf (cffi:mem-ref (slot-value param 'value-ptr) 'sql-pointer-as-int)
               (slot-value param 'position))
         (setf (cffi:mem-ref (slot-value param 'ind-ptr) 'sql-len)
@@ -403 +403 @@
     (progn
       (setf (slot-value param 'temp-val) value)
-      (setf (cffi:mem-ref (slot-value param 'value-ptr) :long)
+      (setf (cffi:mem-ref (slot-value param 'value-ptr) 'sql-pointer-as-int)
               (slot-value param 'position))
       (setf (cffi:mem-ref (slot-value param 'ind-ptr) 'sql-len)
@@ -453 +453 @@
     (progn
       (setf (slot-value param 'temp-val) value)
-      (setf (cffi:mem-ref (slot-value param 'value-ptr) ':long)
+      (setf (cffi:mem-ref (slot-value param 'value-ptr) 'sql-pointer-as-int)
               (slot-value param 'position))
       (setf (cffi:mem-ref (slot-value param 'ind-ptr) 'sql-len)