Bug#381668: sqliteodbc: FTBFS (amd64): conflicting types for 'SQLExtendedFetch'

[Andreas Jochens]

tags 381668 +patch
thanks

Hello,

with the attached patch 'sqliteodbc' can be compiled on 64-bit architectures.

Regards
Andreas Jochens

diff -urN ../tmp-orig/sqliteodbc-0.69/sqlite3odbc.c ./sqlite3odbc.c
--- ../tmp-orig/sqliteodbc-0.69/sqlite3odbc.c   2006-07-23 10:08:54.000000000 
+0000
+++ ./sqlite3odbc.c     2006-08-16 07:06:31.000000000 +0000
@@ -3185,8 +3185,8 @@
  */
 
 SQLRETURN SQL_API
-SQLDescribeParam(SQLHSTMT stmt, UWORD pnum, SWORD *dtype, UDWORD *size,
-                SWORD *decdigits, SWORD *nullable)
+SQLDescribeParam(SQLHSTMT stmt, SQLUSMALLINT pnum, SQLSMALLINT *dtype,
+                SQLULEN *size, SQLSMALLINT *decdigits, SQLSMALLINT *nullable)
 {
     STMT *s;
 
@@ -3251,7 +3251,7 @@
  */
 
 SQLRETURN SQL_API
-SQLParamOptions(SQLHSTMT stmt, UDWORD rows, UDWORD *rowp)
+SQLParamOptions(SQLHSTMT stmt, SQLULEN rows, SQLULEN *rowp)
 {
     return drvunimplstmt(stmt);
 }
@@ -5258,7 +5258,7 @@
  */
 
 SQLRETURN SQL_API
-SQLSetPos(SQLHSTMT stmt, SQLUSMALLINT row, SQLUSMALLINT op, SQLUSMALLINT lock)
+SQLSetPos(SQLHSTMT stmt, SQLSETPOSIROW row, SQLUSMALLINT op, SQLUSMALLINT lock)
 {
     return drvunimplstmt(stmt);
 }
@@ -9107,8 +9107,8 @@
  */
 
 SQLRETURN SQL_API
-SQLExtendedFetch(SQLHSTMT stmt, SQLUSMALLINT orient, SQLLEN offset,
-                SQLULEN *rowcount, SQLUSMALLINT *rowstatus)
+SQLExtendedFetch(SQLHSTMT stmt, SQLUSMALLINT orient, SQLROWOFFSET offset,
+                SQLROWSETSIZE *rowcount, SQLUSMALLINT *rowstatus)
 {
     STMT *s;
     SQLRETURN ret;
diff -urN ../tmp-orig/sqliteodbc-0.69/sqliteodbc.c ./sqliteodbc.c
--- ../tmp-orig/sqliteodbc-0.69/sqliteodbc.c    2006-07-23 08:12:12.000000000 
+0000
+++ ./sqliteodbc.c      2006-08-16 06:34:44.000000000 +0000
@@ -3600,8 +3600,8 @@
  */
 
 SQLRETURN SQL_API
-SQLDescribeParam(SQLHSTMT stmt, UWORD pnum, SWORD *dtype, UDWORD *size,
-                SWORD *decdigits, SWORD *nullable)
+SQLDescribeParam(SQLHSTMT stmt, SQLUSMALLINT pnum, SQLSMALLINT *dtype, 
+                SQLULEN *size, SQLSMALLINT *decdigits, SQLSMALLINT *nullable)
 {
     STMT *s;
 
@@ -3676,7 +3676,7 @@
  */
 
 SQLRETURN SQL_API
-SQLParamOptions(SQLHSTMT stmt, UDWORD rows, UDWORD *rowp)
+SQLParamOptions(SQLHSTMT stmt, SQLULEN rows, SQLULEN *rowp)
 {
     return drvunimplstmt(stmt);
 }
@@ -6227,7 +6227,7 @@
  */
 
 SQLRETURN SQL_API
-SQLSetPos(SQLHSTMT stmt, SQLUSMALLINT row, SQLUSMALLINT op, SQLUSMALLINT lock)
+SQLSetPos(SQLHSTMT stmt, SQLSETPOSIROW row, SQLUSMALLINT op, SQLUSMALLINT lock)
 {
     return drvunimplstmt(stmt);
 }
@@ -10678,8 +10678,8 @@
  */
 
 SQLRETURN SQL_API
-SQLExtendedFetch(SQLHSTMT stmt, SQLUSMALLINT orient, SQLLEN offset,
-                SQLULEN *rowcount, SQLUSMALLINT *rowstatus)
+SQLExtendedFetch(SQLHSTMT stmt, SQLUSMALLINT orient, SQLROWOFFSET offset,
+                SQLROWSETSIZE *rowcount, SQLUSMALLINT *rowstatus)
 {
     STMT *s;
     SQLRETURN ret;
@@ -10873,7 +10873,7 @@
 SQLRETURN SQL_API
 SQLDescribeColW(SQLHSTMT stmt, SQLUSMALLINT col, SQLWCHAR *name,
                SQLSMALLINT nameMax, SQLSMALLINT *nameLen,
-               SQLSMALLINT *type, SQLUINTEGER *size,
+               SQLSMALLINT *type, SQLULEN*size,
                SQLSMALLINT *digits, SQLSMALLINT *nullable)
 {
     SQLRETURN ret;


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]