diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-14 10:01:51 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-14 10:01:51 -0500 |
| commit | 4253373976637f733660b4900f60a45df0299fe9 (patch) | |
| tree | 930360c461fd397dc5ac99b123592bdb62c6a7c1 /src/sql/drivers/odbc/qsql_odbc.cpp | |
| parent | b4d259b5405a715bb538ed103290cda407227c6e (diff) | |
| parent | e20b43430837963d47b87d290be7a0996182c8a9 (diff) | |
| download | qt3-4253373976637f733660b4900f60a45df0299fe9.tar.gz qt3-4253373976637f733660b4900f60a45df0299fe9.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src/sql/drivers/odbc/qsql_odbc.cpp')
| -rw-r--r-- | src/sql/drivers/odbc/qsql_odbc.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp index b09afd2..8b0b58b 100644 --- a/src/sql/drivers/odbc/qsql_odbc.cpp +++ b/src/sql/drivers/odbc/qsql_odbc.cpp @@ -61,19 +61,18 @@ #endif // newer platform SDKs use SQLLEN instead of SQLINTEGER -#ifdef SQLLEN +#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) # define QSQLLEN SQLLEN #else # define QSQLLEN SQLINTEGER #endif -#ifdef SQLULEN +#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) # define QSQLULEN SQLULEN #else # define QSQLULEN SQLUINTEGER #endif - static const QSQLLEN COLNAMESIZE = 256; //Map Qt parameter types to ODBC types static const SQLSMALLINT qParamType[ 4 ] = { SQL_PARAM_INPUT, SQL_PARAM_INPUT, SQL_PARAM_OUTPUT, SQL_PARAM_INPUT_OUTPUT }; |