r10077: * multiple: Apply patch from Joerg Hoehle with multiple

[clsql.git] / db-oracle / oracle-api.lisp

diff --git a/db-oracle/oracle-api.lisp b/db-oracle/oracle-api.lisp
index e63351fcde4f5e878d0596fec7ddbd6895fec770..1e21b81b9d0a5849fd7ceb28fed89644fce4b85b 100644 (file)
--- a/db-oracle/oracle-api.lisp
+++ b/db-oracle/oracle-api.lisp
@@ -60,8 +60,6 @@
              (error 'sql-database-error :message "OCI No Data Found"))
             (#.+oci-success-with-info+
              (error 'sql-database-error :message "internal error: unexpected +oci-success-with-info"))
-            (#.+oci-no-data+
-             (error 'sql-database-error :message "OCI No Data"))
             (#.+oci-invalid-handle+
              (error 'sql-database-error :message "OCI Invalid Handle"))
             (#.+oci-need-data+
@@ -104,17 +102,17 @@
   (xtramem-sz :unsigned-long)            ; size_t
   (usermempp (* :pointer-void)))                    ; dvoid **
   
-#+oci-8-1-5
+#-oci7
 (def-oci-routine ("OCIEnvCreate" oci-env-create)
     :int
-  (p0 :pointer-void)
-  (p1 :unsigned-int)
-  (p2 :pointer-void)
-  (p3 :pointer-void)
-  (p4 :pointer-void)
-  (p5 :pointer-void)
-  (p6 :unsigned-long)
-  (p7 :pointer-void))
+  (envhpp (* :pointer-void))
+  (mode :unsigned-int)
+  (ctxp :pointer-void)
+  (malocfp :pointer-void)
+  (ralocfp :pointer-void)
+  (mfreefp :pointer-void)
+  (xtramemsz :unsigned-long)
+  (usrmempp (* :pointer-void)))
 
 (def-oci-routine ("OCIHandleAlloc" oci-handle-alloc)
     :int
@@ -220,7 +218,7 @@
   (valuep      :pointer-void)
   (value_sz      :long)
   (dty      :unsigned-short)         
-  (indp      :pointer-void)
+  (indp      (* :short))
   (rlenp      (* :unsigned-short))          
   (rcodep      (* :unsigned-short))          
   (mode     :unsigned-long))