diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-02-25 23:35:43 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-02-25 23:35:43 (GMT) |
| commit | 31c8459d65aaca9131a8aa32e29e0591ed7892cb (patch) | |
| tree | 5339f4b4291c17a9a765a70990ec3c12f4055de7 /src/sql/drivers/oci | |
| parent | 5c82031a7357f4f3d100be30c0bfe4e878712829 (diff) | |
| parent | 61811d9b43828c1cc53c773fd66b78313f4fb942 (diff) | |
| download | Qt-31c8459d65aaca9131a8aa32e29e0591ed7892cb.zip Qt-31c8459d65aaca9131a8aa32e29e0591ed7892cb.tar.gz Qt-31c8459d65aaca9131a8aa32e29e0591ed7892cb.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Conflicts:
src/declarative/qml/qdeclarativeproperty.cpp
Diffstat (limited to 'src/sql/drivers/oci')
| -rw-r--r-- | src/sql/drivers/oci/qsql_oci.cpp | 6 |
1 files changed, 6 insertions, 0 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 |