File qt-4.5.2-fix-clucene-tchar-confusion.patch of Package mingw32-libqt4

Overview Repositories Revisions Requests Users Attributes Meta

File qt-4.5.2-fix-clucene-tchar-confusion.patch of Package mingw32-libqt4 (Revision e7e2938e83a5faf44686f20f98f3d936)

Currently displaying revision e7e2938e83a5faf44686f20f98f3d936 , Show latest

--- src/3rdparty/clucene/src/CLucene/config/repl_tchar.h.orig	2009-06-20 07:01:55.000000000 +0200
+++ src/3rdparty/clucene/src/CLucene/config/repl_tchar.h	2009-09-10 13:06:55.000000000 +0200
@@ -6,8 +6,17 @@
 ------------------------------------------------------------------------------*/
 #ifndef _CL_HAVE_TCHAR_H
 #if defined(_UCS2)
+#ifdef __MINGW64_VERSION_MAJOR
+# ifdef __cplusplus
+  extern "C" {
+# endif
+    typedef wchar_t TCHAR;
+# ifdef __cplusplus
+  }
+# endif
+#else
     #define TCHAR wchar_t
-    
+#endif
     //note: descriptions with * in front have replacement functions
     
     //formatting functions
--- tools/assistant/lib/fulltextsearch/qclucene_global_p.h.orig	2009-06-20 07:01:59.000000000 +0200
+++ tools/assistant/lib/fulltextsearch/qclucene_global_p.h	2009-09-10 13:37:00.000000000 +0200
@@ -29,7 +29,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(__MINGW64_VERSION_MAJOR) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
 #   if !defined(TCHAR)
 #       define TCHAR wchar_t
 #   endif

Places

File qt-4.5.2-fix-clucene-tchar-confusion.patch of Package mingw32-libqt4 (Revision e7e2938e83a5faf44686f20f98f3d936)

Places