summaryrefslogtreecommitdiffstats
path: root/src/sql/drivers/odbc/qsql_odbc.h
diff options
context:
space:
mode:
authorBill King <bill.king@nokia.com>2009-12-16 00:22:06 (GMT)
committerBill King <bill.king@nokia.com>2009-12-16 00:22:06 (GMT)
commitbba8f557f59d17e68ec0d9707e66c5324bb4bd33 (patch)
treed41363a625e6e3391b2bd900f6002ef851833249 /src/sql/drivers/odbc/qsql_odbc.h
parentda89e73abcc8f4a1d19163fd6d39bb86e1ff0b53 (diff)
downloadQt-bba8f557f59d17e68ec0d9707e66c5324bb4bd33.zip
Qt-bba8f557f59d17e68ec0d9707e66c5324bb4bd33.tar.gz
Qt-bba8f557f59d17e68ec0d9707e66c5324bb4bd33.tar.bz2
Remove obsolete code for unsupported platforms
This code was apparently put in for OSX10.3. ODBC2 is over 10 years old now, and even microsoft doesn't support any fashion to link to the ansi versions of the functions. Remove the #define so that we don't have to support it any more. Reviewed-by: Justin McPherson
Diffstat (limited to 'src/sql/drivers/odbc/qsql_odbc.h')
-rw-r--r--src/sql/drivers/odbc/qsql_odbc.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/sql/drivers/odbc/qsql_odbc.h b/src/sql/drivers/odbc/qsql_odbc.h
index 8bd7660..aa96feb 100644
--- a/src/sql/drivers/odbc/qsql_odbc.h
+++ b/src/sql/drivers/odbc/qsql_odbc.h
@@ -49,13 +49,6 @@
#include <QtCore/qt_windows.h>
#endif
-#if defined (Q_OS_MAC) && (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3)
-// assume we use iodbc on MACX
-// comment next line out if you use a
-// unicode compatible manager
-# define Q_ODBC_VERSION_2
-#endif
-
#ifdef QT_PLUGIN
#define Q_EXPORT_SQLDRIVER_ODBC
#else
@@ -75,10 +68,7 @@
# undef _MSC_VER
#endif
-#ifndef Q_ODBC_VERSION_2
#include <sqlucode.h>
-#endif
-
#include <sqlext.h>
QT_BEGIN_HEADER