diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-05-29 08:48:53 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-05-29 08:52:02 (GMT) |
| commit | 7bc17b5b9ff9f2e3e04f36fec8ccbb546d9b7a31 (patch) | |
| tree | ac23b0ae9f4ebba6671dfd06d274bdf8488b7dc5 /tools | |
| parent | f67bc13bc8e2d2c76d7d9f12abb1dbda85abe337 (diff) | |
| download | Qt-7bc17b5b9ff9f2e3e04f36fec8ccbb546d9b7a31.zip Qt-7bc17b5b9ff9f2e3e04f36fec8ccbb546d9b7a31.tar.gz Qt-7bc17b5b9ff9f2e3e04f36fec8ccbb546d9b7a31.tar.bz2 | |
Fixed build issues with MSVC
in atomic operations, we declare Interlock... functions in the namespace
That can confuse the compiler because they are also declared in another
header outside the namespace.
Same problem in clucene where we include windows.h from within the NS.
Task-number: 254214
Reviewed-by: ogoffart
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/assistant/lib/fulltextsearch/qclucene_global_p.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/assistant/lib/fulltextsearch/qclucene_global_p.h b/tools/assistant/lib/fulltextsearch/qclucene_global_p.h index 2a9d146..3dba45a 100644 --- a/tools/assistant/lib/fulltextsearch/qclucene_global_p.h +++ b/tools/assistant/lib/fulltextsearch/qclucene_global_p.h @@ -29,6 +29,14 @@ #include <QtCore/QChar> #include <QtCore/QString> +#if !defined(_MSC_VER) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T) +# if !defined(TCHAR) +# define TCHAR wchar_t +# endif +#else +# include <windows.h> +#endif + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -87,14 +95,6 @@ QT_BEGIN_NAMESPACE # define CL_NS2(sub,sub2) #endif -#if !defined(_MSC_VER) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T) -# if !defined(TCHAR) -# define TCHAR wchar_t -# endif -#else -# include <windows.h> -#endif - namespace { TCHAR* QStringToTChar(const QString &str) { |