diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-04-09 07:48:31 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-04-09 07:48:31 (GMT) |
| commit | b69d5d35e0705a494aff6dfd021dde1ace1b3d7b (patch) | |
| tree | e3b6799ab37a54594a2210919ecb96f31376e941 /tools/assistant/lib | |
| parent | fa46493ef935ecfc915fa03c4c2372236c70bede (diff) | |
| download | Qt-b69d5d35e0705a494aff6dfd021dde1ace1b3d7b.zip Qt-b69d5d35e0705a494aff6dfd021dde1ace1b3d7b.tar.gz Qt-b69d5d35e0705a494aff6dfd021dde1ace1b3d7b.tar.bz2 | |
Build fix for mingw
Diffstat (limited to 'tools/assistant/lib')
| -rw-r--r-- | tools/assistant/lib/fulltextsearch/qclucene-config_p.h | 14 | ||||
| -rw-r--r-- | tools/assistant/lib/fulltextsearch/qclucene_global_p.h | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/tools/assistant/lib/fulltextsearch/qclucene-config_p.h b/tools/assistant/lib/fulltextsearch/qclucene-config_p.h index 0c70718..387d64d 100644 --- a/tools/assistant/lib/fulltextsearch/qclucene-config_p.h +++ b/tools/assistant/lib/fulltextsearch/qclucene-config_p.h @@ -314,14 +314,12 @@ configure. #define _CL_HAVE_SYS_TYPES_H 1 #endif -// Do not use the tchar.h that ships with mingw, this causes the qt build to -// fail (211547, 211401, etc...), reuse the replacement as with any other compiler -// #if defined(__MINGW32__) -// /* Define to 1 if you have the <tchar.h> header file. */ -// # ifndef _CL_HAVE_TCHAR_H -// # define _CL_HAVE_TCHAR_H 1 -// # endif -// #endif +#if defined(__MINGW32__) + /* Define to 1 if you have the <tchar.h> header file. */ + # ifndef _CL_HAVE_TCHAR_H + # define _CL_HAVE_TCHAR_H 1 + # endif +#endif #if defined(__MINGW32__) || defined(__SUNPRO_CC) || defined(__SUNPRO_C) /* Define to 1 if you have the `tell' function. */ diff --git a/tools/assistant/lib/fulltextsearch/qclucene_global_p.h b/tools/assistant/lib/fulltextsearch/qclucene_global_p.h index f4b744d..206725b 100644 --- a/tools/assistant/lib/fulltextsearch/qclucene_global_p.h +++ b/tools/assistant/lib/fulltextsearch/qclucene_global_p.h @@ -36,7 +36,7 @@ #include <QtCore/QChar> #include <QtCore/QString> -#if !defined(_MSC_VER) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T) +#if !defined(_MSC_VER) && !defined(__MINGW32__) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T) # if !defined(TCHAR) # define TCHAR wchar_t # endif |