diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-06-15 02:39:05 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-15 07:25:27 +0200 |
| commit | 1b5bf6035e5d1df2478eeee04175fd3f3bd81349 (patch) | |
| tree | 21524c733f018f038be52651638afea365c70c7b | |
| parent | 9e52d0e179b987f885b7377f47da0e2fd0c5fb93 (diff) | |
| download | qtscript-1b5bf6035e5d1df2478eeee04175fd3f3bd81349.tar.gz | |
Fix possible type collision with ICU
see https://bugs.gentoo.org/show_bug.cgi?id=407315
The UChar32 is declared as signed 32-bit int since ICU 2.4,
no chance they'll fix their code.
Change-Id: I9691507c8ca14a04610e9b13ae13f416929ffa08
Reviewed-by: Davide Pesavento <davidepesa@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h index 33b3337..eeadfea 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h @@ -36,7 +36,7 @@ typedef wchar_t UChar; #else typedef uint16_t UChar; #endif -typedef uint32_t UChar32; +typedef int32_t UChar32; // some defines from ICU |