| 1 |
graaff 10/05/30 11:46:40 |
| 2 |
|
| 3 |
Added: mdbtools-0.6_pre2-odbc_definitions.patch |
| 4 |
Log: |
| 5 |
Fix compilation against current unixODBC. Thanks to Hank Leininger for providing the patch in bug 311973. |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-office/mdbtools/files/mdbtools-0.6_pre2-odbc_definitions.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/mdbtools/files/mdbtools-0.6_pre2-odbc_definitions.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/mdbtools/files/mdbtools-0.6_pre2-odbc_definitions.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: mdbtools-0.6_pre2-odbc_definitions.patch |
| 15 |
=================================================================== |
| 16 |
--- mdbtools-cvs-20050624/src/odbc/odbc.c.orig 2010-05-24 10:20:59.000000000 -0400 |
| 17 |
+++ mdbtools-cvs-20050624/src/odbc/odbc.c 2010-05-25 17:28:05.000000000 -0400 |
| 18 |
@@ -210,7 +210,7 @@ |
| 19 |
SQLHSTMT hstmt, |
| 20 |
SQLUSMALLINT ipar, |
| 21 |
SQLSMALLINT FAR *pfSqlType, |
| 22 |
- SQLUINTEGER FAR *pcbParamDef, |
| 23 |
+ SQLULEN FAR *pcbParamDef, |
| 24 |
SQLSMALLINT FAR *pibScale, |
| 25 |
SQLSMALLINT FAR *pfNullable) |
| 26 |
{ |
| 27 |
@@ -221,8 +221,8 @@ |
| 28 |
SQLRETURN SQL_API SQLExtendedFetch( |
| 29 |
SQLHSTMT hstmt, |
| 30 |
SQLUSMALLINT fFetchType, |
| 31 |
- SQLINTEGER irow, |
| 32 |
- SQLUINTEGER FAR *pcrow, |
| 33 |
+ SQLLEN irow, |
| 34 |
+ SQLULEN FAR *pcrow, |
| 35 |
SQLUSMALLINT FAR *rgfRowStatus) |
| 36 |
{ |
| 37 |
struct _hstmt *stmt = (struct _hstmt *) hstmt; |
| 38 |
@@ -297,8 +297,8 @@ |
| 39 |
|
| 40 |
SQLRETURN SQL_API SQLParamOptions( |
| 41 |
SQLHSTMT hstmt, |
| 42 |
- SQLUINTEGER crow, |
| 43 |
- SQLUINTEGER FAR *pirow) |
| 44 |
+ SQLULEN crow, |
| 45 |
+ SQLULEN FAR *pirow) |
| 46 |
{ |
| 47 |
TRACE("SQLParamOptions"); |
| 48 |
return SQL_SUCCESS; |
| 49 |
@@ -347,7 +347,7 @@ |
| 50 |
|
| 51 |
SQLRETURN SQL_API SQLSetPos( |
| 52 |
SQLHSTMT hstmt, |
| 53 |
- SQLUSMALLINT irow, |
| 54 |
+ SQLSETPOSIROW irow, |
| 55 |
SQLUSMALLINT fOption, |
| 56 |
SQLUSMALLINT fLock) |
| 57 |
{ |
| 58 |
@@ -398,11 +398,11 @@ |
| 59 |
SQLSMALLINT fParamType, |
| 60 |
SQLSMALLINT fCType, |
| 61 |
SQLSMALLINT fSqlType, |
| 62 |
- SQLUINTEGER cbColDef, |
| 63 |
+ SQLULEN cbColDef, |
| 64 |
SQLSMALLINT ibScale, |
| 65 |
SQLPOINTER rgbValue, |
| 66 |
- SQLINTEGER cbValueMax, |
| 67 |
- SQLINTEGER FAR *pcbValue) |
| 68 |
+ SQLLEN cbValueMax, |
| 69 |
+ SQLLEN FAR *pcbValue) |
| 70 |
{ |
| 71 |
struct _hstmt *stmt; |
| 72 |
|
| 73 |
@@ -502,8 +502,8 @@ |
| 74 |
SQLUSMALLINT icol, |
| 75 |
SQLSMALLINT fCType, |
| 76 |
SQLPOINTER rgbValue, |
| 77 |
- SQLINTEGER cbValueMax, |
| 78 |
- SQLINTEGER FAR *pcbValue) |
| 79 |
+ SQLLEN cbValueMax, |
| 80 |
+ SQLLEN FAR *pcbValue) |
| 81 |
{ |
| 82 |
struct _hstmt *stmt = (struct _hstmt *) hstmt; |
| 83 |
struct _sql_bind_info *cur, *newitem; |
| 84 |
@@ -594,7 +594,7 @@ |
| 85 |
SQLSMALLINT cbColNameMax, |
| 86 |
SQLSMALLINT FAR *pcbColName, |
| 87 |
SQLSMALLINT FAR *pfSqlType, |
| 88 |
- SQLUINTEGER FAR *pcbColDef, /* precision */ |
| 89 |
+ SQLULEN FAR *pcbColDef, /* precision */ |
| 90 |
SQLSMALLINT FAR *pibScale, |
| 91 |
SQLSMALLINT FAR *pfNullable) |
| 92 |
{ |
| 93 |
@@ -649,7 +649,7 @@ |
| 94 |
SQLPOINTER rgbDesc, |
| 95 |
SQLSMALLINT cbDescMax, |
| 96 |
SQLSMALLINT FAR *pcbDesc, |
| 97 |
- SQLINTEGER FAR *pfDesc) |
| 98 |
+ SQLLEN FAR *pfDesc) |
| 99 |
{ |
| 100 |
int namelen, i; |
| 101 |
struct _hstmt *stmt; |
| 102 |
@@ -969,7 +969,7 @@ |
| 103 |
|
| 104 |
SQLRETURN SQL_API SQLRowCount( |
| 105 |
SQLHSTMT hstmt, |
| 106 |
- SQLINTEGER FAR *pcrow) |
| 107 |
+ SQLLEN FAR *pcrow) |
| 108 |
{ |
| 109 |
struct _hstmt *stmt=(struct _hstmt *)hstmt; |
| 110 |
|
| 111 |
@@ -1002,10 +1002,10 @@ |
| 112 |
SQLUSMALLINT ipar, |
| 113 |
SQLSMALLINT fCType, |
| 114 |
SQLSMALLINT fSqlType, |
| 115 |
- SQLUINTEGER cbParamDef, |
| 116 |
+ SQLULEN cbParamDef, |
| 117 |
SQLSMALLINT ibScale, |
| 118 |
SQLPOINTER rgbValue, |
| 119 |
- SQLINTEGER FAR *pcbValue) |
| 120 |
+ SQLLEN FAR *pcbValue) |
| 121 |
{ |
| 122 |
TRACE("SQLSetParam"); |
| 123 |
return SQL_SUCCESS; |
| 124 |
@@ -1125,8 +1125,8 @@ |
| 125 |
SQLUSMALLINT icol, |
| 126 |
SQLSMALLINT fCType, |
| 127 |
SQLPOINTER rgbValue, |
| 128 |
- SQLINTEGER cbValueMax, |
| 129 |
- SQLINTEGER FAR *pcbValue) |
| 130 |
+ SQLLEN cbValueMax, |
| 131 |
+ SQLLEN FAR *pcbValue) |
| 132 |
{ |
| 133 |
struct _hstmt *stmt; |
| 134 |
struct _hdbc *dbc; |
| 135 |
@@ -1457,7 +1457,7 @@ |
| 136 |
SQLRETURN SQL_API SQLPutData( |
| 137 |
SQLHSTMT hstmt, |
| 138 |
SQLPOINTER rgbValue, |
| 139 |
- SQLINTEGER cbValue) |
| 140 |
+ SQLLEN cbValue) |
| 141 |
{ |
| 142 |
TRACE("SQLPutData"); |
| 143 |
return SQL_SUCCESS; |
| 144 |
@@ -1466,7 +1466,7 @@ |
| 145 |
SQLRETURN SQL_API SQLSetConnectOption( |
| 146 |
SQLHDBC hdbc, |
| 147 |
SQLUSMALLINT fOption, |
| 148 |
- SQLUINTEGER vParam) |
| 149 |
+ SQLULEN vParam) |
| 150 |
{ |
| 151 |
TRACE("SQLSetConnectOption"); |
| 152 |
return SQL_SUCCESS; |
| 153 |
@@ -1475,7 +1475,7 @@ |
| 154 |
SQLRETURN SQL_API SQLSetStmtOption( |
| 155 |
SQLHSTMT hstmt, |
| 156 |
SQLUSMALLINT fOption, |
| 157 |
- SQLUINTEGER vParam) |
| 158 |
+ SQLULEN vParam) |
| 159 |
{ |
| 160 |
TRACE("SQLSetStmtOption"); |
| 161 |
return SQL_SUCCESS; |
Archives