]>
Commit | Line | Data |
---|---|---|
a485b266 AM |
1 | unixODBC 2.2.14 defines SQLLEN and SQLULEN using the compiler typedef |
2 | declaration instead of preprocessor #define macro definition. This breaks | |
3 | the preprocessor checks in this include file.cpp, causing the source to fall | |
4 | back to older types instead, leading to compile time errors like this: | |
5 | ||
6 | db.cpp:1636: error: cannot convert ‘SQLINTEGER*’ to ‘SQLLEN*’ for argument ‘6’ to | |
7 | ‘SQLRETURN SQLGetData(void*, SQLUSMALLINT, SQLSMALLINT, void*, SQLLEN, SQLLEN*)’ | |
8 | ... | |
9 | dbtable.cpp:592: error: cannot convert ‘SQLUINTEGER*’ to ‘SQLULEN*’ for argument ‘4’ to | |
10 | ‘SQLRETURN SQLExtendedFetch(void*, SQLUSMALLINT, SQLLEN, SQLULEN*, SQLUSMALLINT*)’ | |
11 | ... | |
12 | ||
13 | This change hard-wires the new names, breaking compatibility with ancient | |
14 | (pre 2001) unixODBC versions. This change may break other ODBC implementations | |
15 | but in Gentoo only unixODBC is supported. | |
16 | ||
17 | References: | |
18 | http://bugs.gentoo.org/310923 | |
19 | ||
20 | 2010-03-23 Martin von Gagern | |
21 | ||
22 | --- wxPython-src-2.6.4.0.orig/include/wx/db.h | |
23 | +++ wxPython-src-2.6.4.0/include/wx/db.h | |
24 | @@ -134,15 +134,6 @@ enum enumDummy {enumDum1}; | |
25 | #endif | |
26 | #endif | |
27 | ||
28 | -#ifndef _WIN64 | |
29 | -#ifndef SQLLEN | |
30 | -#define SQLLEN SQLINTEGER | |
31 | -#endif | |
32 | -#ifndef SQLULEN | |
33 | -#define SQLULEN SQLUINTEGER | |
34 | -#endif | |
35 | -#endif | |
36 | - | |
37 | const int wxDB_PATH_MAX = 254; | |
38 | ||
39 | extern WXDLLIMPEXP_DATA_ODBC(wxChar const *) SQL_LOG_FILENAME; |