diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-02-23 09:54:23 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-02-23 09:54:23 (GMT) |
| commit | 283b6815586a87e458732534bc3c9c76b38ba49f (patch) | |
| tree | 4f540dfcea87b6505e6b0eff07d1b31ed50b6591 /src/sql | |
| parent | 7d6f139c0bad17c84aa05b84450abb567a5b5458 (diff) | |
| download | Qt-283b6815586a87e458732534bc3c9c76b38ba49f.zip Qt-283b6815586a87e458732534bc3c9c76b38ba49f.tar.gz Qt-283b6815586a87e458732534bc3c9c76b38ba49f.tar.bz2 | |
improve sql support for mingw64
Diffstat (limited to 'src/sql')
| -rw-r--r-- | src/sql/drivers/oci/qsql_oci.cpp | 6 | ||||
| -rw-r--r-- | src/sql/drivers/odbc/qsql_odbc.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/sql/drivers/oci/qsql_oci.cpp b/src/sql/drivers/oci/qsql_oci.cpp index b5c85e6..de2be89 100644 --- a/src/sql/drivers/oci/qsql_oci.cpp +++ b/src/sql/drivers/oci/qsql_oci.cpp @@ -56,6 +56,12 @@ #include <qvector.h> #include <qdebug.h> +// This is needed for oracle oci when compiling with mingw-w64 headers +#if defined(__MINGW64_VERSION_MAJOR) && defined(_WIN64) +#define _int64 __int64 +#endif + + #include <oci.h> #ifdef max #undef max diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp index fab3ab3..9f7d267 100644 --- a/src/sql/drivers/odbc/qsql_odbc.cpp +++ b/src/sql/drivers/odbc/qsql_odbc.cpp @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE #define ODBC_CHECK_DRIVER // newer platform SDKs use SQLLEN instead of SQLINTEGER -#if defined(WIN32) && (_MSC_VER < 1300) +#if defined(WIN32) && (_MSC_VER < 1300) && !defined(__MINGW64_VERSION_MAJOR) # define QSQLLEN SQLINTEGER # define QSQLULEN SQLUINTEGER #else |