diff options
| author | Bill King <bill.king@nokia.com> | 2009-05-01 04:24:13 (GMT) |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2009-05-01 04:24:13 (GMT) |
| commit | 5f7cd6ca85b2cb2dc996f260694255d31670766e (patch) | |
| tree | adb8f94a1f636b4ae737600ff35e85b9bfc0b184 | |
| parent | 1a18308b311f031d001e3b3e98ffb61e840a6d8c (diff) | |
| download | Qt-5f7cd6ca85b2cb2dc996f260694255d31670766e.zip Qt-5f7cd6ca85b2cb2dc996f260694255d31670766e.tar.gz Qt-5f7cd6ca85b2cb2dc996f260694255d31670766e.tar.bz2 | |
Apparently this is the best way to determine which to use
Best as I can determine via trial and error. It should make vc6 compile again though.
| -rw-r--r-- | src/sql/drivers/odbc/qsql_odbc.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp index 4e90777..9932463 100644 --- a/src/sql/drivers/odbc/qsql_odbc.cpp +++ b/src/sql/drivers/odbc/qsql_odbc.cpp @@ -70,13 +70,12 @@ QT_BEGIN_NAMESPACE #endif // newer platform SDKs use SQLLEN instead of SQLINTEGER -//#if defined(SQLLEN) || defined(Q_OS_WIN64) -#if ODBCVER >= 0x0270 -# define QSQLLEN SQLLEN -# define QSQLULEN SQLULEN -#else +#if defined(WIN32) && (_MSC_VER < 1300) # define QSQLLEN SQLINTEGER # define QSQLULEN SQLUINTEGER +#else +# define QSQLLEN SQLLEN +# define QSQLULEN SQLULEN #endif |