Attachment #273 for bug #792

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 792
Collapse All | Expand All




#endif

// newer platform SDKs use SQLLEN instead of SQLINTEGER
#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
# define QSQLLEN SQLLEN
#else
# define QSQLLEN SQLINTEGER
#endif

#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
# define QSQLULEN SQLULEN
#else
# define QSQLULEN SQLUINTEGER
#endif


static const QSQLLEN COLNAMESIZE = 256;
//Map Qt parameter types to ODBC types
static const SQLSMALLINT qParamType[ 4 ] = { SQL_PARAM_INPUT, SQL_PARAM_INPUT, SQL_PARAM_OUTPUT, SQL_PARAM_INPUT_OUTPUT };





mac {
        !contains( LIBS, .*odbc.* ) {
            LIBS        *= -liodbc
        }
}

unix {
	OBJECTS_DIR	= .obj
	!contains( LIBS, .*odbc.* ) {
	    LIBS 	*= -lodbc
	}
}






		mac {
			!contains( LIBS, .*odbc.* ) {
				LIBS        *= -lodbc
			}
		}

		unix {
			!contains( LIBS, .*odbc.* ) {
				LIBS        *= -lodbc
			}
		}

Return to bug 792

Lines 61-79 Link Here

(-)qt3/src/sql/drivers/odbc/qsql_odbc.cpp (-3 / +2 lines)
61	#endif	61	#endif
62		62
63	// newer platform SDKs use SQLLEN instead of SQLINTEGER	63	// newer platform SDKs use SQLLEN instead of SQLINTEGER
64	#ifdef SQLLEN	64	#if defined(SQLLEN) \|\| defined(Q_OS_WIN64) \|\| defined(Q_OS_UNIX)
65	# define QSQLLEN SQLLEN	65	# define QSQLLEN SQLLEN
66	#else	66	#else
67	# define QSQLLEN SQLINTEGER	67	# define QSQLLEN SQLINTEGER
68	#endif	68	#endif
69		69
70	#ifdef SQLULEN	70	#if defined(SQLULEN) \|\| defined(Q_OS_WIN64) \|\| defined(Q_OS_UNIX)
71	# define QSQLULEN SQLULEN	71	# define QSQLULEN SQLULEN
72	#else	72	#else
73	# define QSQLULEN SQLUINTEGER	73	# define QSQLULEN SQLUINTEGER
74	#endif	74	#endif
75		75
76
77	static const QSQLLEN COLNAMESIZE = 256;	76	static const QSQLLEN COLNAMESIZE = 256;
78	//Map Qt parameter types to ODBC types	77	//Map Qt parameter types to ODBC types
79	static const SQLSMALLINT qParamType[ 4 ] = { SQL_PARAM_INPUT, SQL_PARAM_INPUT, SQL_PARAM_OUTPUT, SQL_PARAM_INPUT_OUTPUT };	78	static const SQLSMALLINT qParamType[ 4 ] = { SQL_PARAM_INPUT, SQL_PARAM_INPUT, SQL_PARAM_OUTPUT, SQL_PARAM_INPUT_OUTPUT };

Lines 10-23 Link Here

(-)qt3/plugins/src/sqldrivers/odbc/odbc.pro (-2 / +2 lines)
10		10
11	mac {	11	mac {
12	!contains( LIBS, .odbc. ) {	12	!contains( LIBS, .odbc. ) {
13	LIBS *= -liodbc	13	LIBS *= -liodbc
14	}	14	}
15	}	15	}
16		16
17	unix {	17	unix {
18	OBJECTS_DIR = .obj	18	OBJECTS_DIR = .obj
19	!contains( LIBS, .odbc. ) {	19	!contains( LIBS, .odbc. ) {
20	LIBS *= -liodbc	20	LIBS *= -lodbc
21	}	21	}
22	}	22	}
23		23

Lines 110-122 Link Here

(-)qt3/src/sql/qt_sql.pri (-2 / +2 lines)
110		110
111	mac {	111	mac {
112	!contains( LIBS, .odbc. ) {	112	!contains( LIBS, .odbc. ) {
113	LIBS *= -liodbc	113	LIBS *= -lodbc
114	}	114	}
115	}	115	}
116		116
117	unix {	117	unix {
118	!contains( LIBS, .odbc. ) {	118	!contains( LIBS, .odbc. ) {
119	LIBS *= -liodbc	119	LIBS *= -lodbc
120	}	120	}
121	}	121	}