changeset 37 | 758a864f9613 |
parent 30 | 5dc02b23752f |
--- a/src/sql/kernel/qsqldatabase.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/sql/kernel/qsqldatabase.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -60,7 +60,10 @@ #include "../drivers/oci/qsql_oci.h" #endif #ifdef QT_SQL_TDS +// conflicting RETCODE typedef between odbc and freetds +#define RETCODE DBRETCODE #include "../drivers/tds/qsql_tds.h" +#undef RETCODE #endif #ifdef QT_SQL_DB2 #include "../drivers/db2/qsql_db2.h"