diff --git a/src/odbc/odbc.c b/src/odbc/odbc.c
index a0ec422..f96a2d6 100644
--- a/src/odbc/odbc.c
+++ b/src/odbc/odbc.c
@@ -209,7 +209,7 @@ SQLRETURN SQL_API SQLDescribeParam(
     SQLHSTMT           hstmt,
     SQLUSMALLINT       ipar,
     SQLSMALLINT FAR   *pfSqlType,
-    SQLUINTEGER FAR   *pcbParamDef,
+    SQLULEN FAR       *pcbParamDef,
     SQLSMALLINT FAR   *pibScale,
     SQLSMALLINT FAR   *pfNullable)
 {
@@ -220,8 +220,8 @@ SQLRETURN SQL_API SQLDescribeParam(
 SQLRETURN SQL_API SQLExtendedFetch(
     SQLHSTMT           hstmt,
     SQLUSMALLINT       fFetchType,
-    SQLINTEGER         irow,
-    SQLUINTEGER FAR   *pcrow,
+    SQLROWOFFSET       irow,
+    SQLROWSETSIZE FAR  *pcrow,
     SQLUSMALLINT FAR  *rgfRowStatus)
 {
 struct _hstmt *stmt = (struct _hstmt *) hstmt;
@@ -296,8 +296,8 @@ SQLRETURN SQL_API SQLNumParams(
 
 SQLRETURN SQL_API SQLParamOptions(
     SQLHSTMT           hstmt,
-    SQLUINTEGER        crow,
-    SQLUINTEGER FAR   *pirow)
+    SQLULEN            crow,
+    SQLULEN FAR       *pirow)
 {
 	TRACE("SQLParamOptions");
 	return SQL_SUCCESS;
@@ -346,7 +346,7 @@ SQLRETURN SQL_API SQLProcedures(
 
 SQLRETURN SQL_API SQLSetPos(
     SQLHSTMT           hstmt,
-    SQLUSMALLINT       irow,
+    SQLSETPOSIROW      irow,
     SQLUSMALLINT       fOption,
     SQLUSMALLINT       fLock)
 {
@@ -397,11 +397,11 @@ SQLRETURN SQL_API SQLBindParameter(
     SQLSMALLINT        fParamType,
     SQLSMALLINT        fCType,
     SQLSMALLINT        fSqlType,
-    SQLUINTEGER        cbColDef,
+    SQLULEN            cbColDef,
     SQLSMALLINT        ibScale,
     SQLPOINTER         rgbValue,
-    SQLINTEGER         cbValueMax,
-    SQLINTEGER FAR    *pcbValue)
+    SQLLEN             cbValueMax,
+    SQLLEN FAR        *pcbValue)
 {
 struct _hstmt *stmt;
 
@@ -501,8 +501,8 @@ SQLRETURN SQL_API SQLBindCol(
     SQLUSMALLINT       icol,
     SQLSMALLINT        fCType,
     SQLPOINTER         rgbValue,
-    SQLINTEGER         cbValueMax,
-    SQLINTEGER FAR    *pcbValue)
+    SQLLEN             cbValueMax,
+    SQLLEN FAR        *pcbValue)
 {
 	struct _hstmt *stmt = (struct _hstmt *) hstmt;
 	struct _sql_bind_info *cur, *newitem;
@@ -593,7 +593,7 @@ SQLRETURN SQL_API SQLDescribeCol(
     SQLSMALLINT        cbColNameMax,
     SQLSMALLINT FAR   *pcbColName,
     SQLSMALLINT FAR   *pfSqlType,
-    SQLUINTEGER FAR   *pcbColDef, /* precision */
+    SQLULEN FAR       *pcbColDef, /* precision */
     SQLSMALLINT FAR   *pibScale,
     SQLSMALLINT FAR   *pfNullable)
 {
@@ -648,7 +648,7 @@ SQLRETURN SQL_API SQLColAttributes(
     SQLPOINTER         rgbDesc,
     SQLSMALLINT        cbDescMax,
     SQLSMALLINT FAR   *pcbDesc,
-    SQLINTEGER FAR    *pfDesc)
+    SQLLEN FAR        *pfDesc)
 {
 	int namelen, i;
 	struct _hstmt *stmt;
@@ -976,7 +976,7 @@ SQLRETURN SQL_API SQLPrepare(
 
 SQLRETURN SQL_API SQLRowCount(
     SQLHSTMT           hstmt,
-    SQLINTEGER FAR    *pcrow)
+    SQLLEN FAR        *pcrow)
 {
 struct _hstmt *stmt=(struct _hstmt *)hstmt;
 
@@ -1009,10 +1009,10 @@ SQLRETURN SQL_API SQLSetParam(            /*      Use SQLBindParameter */
     SQLUSMALLINT       ipar,
     SQLSMALLINT        fCType,
     SQLSMALLINT        fSqlType,
-    SQLUINTEGER        cbParamDef,
+    SQLULEN            cbParamDef,
     SQLSMALLINT        ibScale,
     SQLPOINTER         rgbValue,
-    SQLINTEGER FAR     *pcbValue)
+    SQLLEN FAR        *pcbValue)
 {
 	TRACE("SQLSetParam");
 	return SQL_SUCCESS;
@@ -1132,8 +1132,8 @@ SQLRETURN SQL_API SQLGetData(
     SQLUSMALLINT       icol,
     SQLSMALLINT        fCType,
     SQLPOINTER         rgbValue,
-    SQLINTEGER         cbValueMax,
-    SQLINTEGER FAR    *pcbValue)
+    SQLLEN             cbValueMax,
+    SQLLEN FAR        *pcbValue)
 {
 	struct _hstmt *stmt;
 	struct _hdbc *dbc;
@@ -1464,7 +1464,7 @@ SQLRETURN SQL_API SQLParamData(
 SQLRETURN SQL_API SQLPutData(
     SQLHSTMT           hstmt,
     SQLPOINTER         rgbValue,
-    SQLINTEGER         cbValue)
+    SQLLEN             cbValue)
 {
 	TRACE("SQLPutData");
 	return SQL_SUCCESS;
@@ -1473,7 +1473,7 @@ SQLRETURN SQL_API SQLPutData(
 SQLRETURN SQL_API SQLSetConnectOption(
     SQLHDBC            hdbc,
     SQLUSMALLINT       fOption,
-    SQLUINTEGER        vParam)
+    SQLULEN            vParam)
 {
 	TRACE("SQLSetConnectOption");
 	return SQL_SUCCESS;
@@ -1482,7 +1482,7 @@ SQLRETURN SQL_API SQLSetConnectOption(
 SQLRETURN SQL_API SQLSetStmtOption(
     SQLHSTMT           hstmt,
     SQLUSMALLINT       fOption,
-    SQLUINTEGER        vParam)
+    SQLROWCOUNT        vParam)
 {
 	TRACE("SQLSetStmtOption");
 	return SQL_SUCCESS;