diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-09-09 19:42:21 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-09-09 19:42:21 -0500 |
| commit | d9301c40726753022b70cf647f716a71b62f0196 (patch) | |
| tree | 2aea673772e0d925d16de9bfa15df9bcea6cfee1 /arch/calvin/trinity-qt3/old-patches/qt-odbc.patch | |
| parent | 4ff1177df859e74748a37d5a03447ca200f1ce01 (diff) | |
| parent | 1b2e638684ebbf2b777ead2fbbb4b69f3ac00bcb (diff) | |
| download | tde-packaging-d9301c40726753022b70cf647f716a71b62f0196.tar.gz tde-packaging-d9301c40726753022b70cf647f716a71b62f0196.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'arch/calvin/trinity-qt3/old-patches/qt-odbc.patch')
| -rw-r--r-- | arch/calvin/trinity-qt3/old-patches/qt-odbc.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/calvin/trinity-qt3/old-patches/qt-odbc.patch b/arch/calvin/trinity-qt3/old-patches/qt-odbc.patch new file mode 100644 index 000000000..6f21e3cf1 --- /dev/null +++ b/arch/calvin/trinity-qt3/old-patches/qt-odbc.patch @@ -0,0 +1,19 @@ +diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp +--- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig 2009-02-24 11:32:27.000000000 +0100 ++++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp 2009-02-24 11:33:43.000000000 +0100 +@@ -57,13 +57,13 @@ + #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 |