diff options
| author | Darrell Anderson <[email protected]> | 2012-06-14 07:12:29 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-06-14 07:12:29 -0500 |
| commit | af8fdcf1ca7bdbda6f0c1afecd8c2d8ffa23bebb (patch) | |
| tree | c2ed11478fd63fbddf89aeac6ad9a7d165ea289a /src/sql/drivers/odbc | |
| parent | 94c25ec781351f6fd7724030311341ea0d7af5f9 (diff) | |
| parent | f27c2533f735d53c6b555f387c6390c0690cc246 (diff) | |
| download | tqt3-af8fdcf1ca7bdbda6f0c1afecd8c2d8ffa23bebb.tar.gz tqt3-af8fdcf1ca7bdbda6f0c1afecd8c2d8ffa23bebb.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/sql/drivers/odbc')
| -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 f1c9e8da7..cfe4d337f 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 TQSQLLEN SQLLEN #else # define TQSQLLEN SQLINTEGER #endif -#ifdef SQLULEN +#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) # define TQSQLULEN SQLULEN #else # define TQSQLULEN SQLUINTEGER #endif - static const TQSQLLEN COLNAMESIZE = 256; //Map TQt parameter types to ODBC types static const SQLSMALLINT qParamType[ 4 ] = { SQL_PARAM_INPUT, SQL_PARAM_INPUT, SQL_PARAM_OUTPUT, SQL_PARAM_INPUT_OUTPUT }; |