projects / platform / upstream / qtdeclarative.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5165917)
Simplify UChar stub hack
authorSimon Hausmann <simon.hausmann@digia.com>
Thu, 7 Feb 2013 15:47:03 +0000 (16:47 +0100)
committerLars Knoll <lars.knoll@digia.com>
Sat, 9 Feb 2013 09:47:04 +0000 (10:47 +0100)
Don't use uint16_t, because it's not available with all MSVC
versions. Since this is just a stub it's okay to simply write
out the type.

Change-Id: I9220c9476a7263377b723e46e4f49892908bd53c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
src/3rdparty/masm/stubs/wtf/unicode/Unicode.h patch | blob | history

diff --git a/src/3rdparty/masm/stubs/wtf/unicode/Unicode.h b/src/3rdparty/masm/stubs/wtf/unicode/Unicode.h
index d61bc64..9e7427e 100644 (file)
--- a/src/3rdparty/masm/stubs/wtf/unicode/Unicode.h
+++ b/src/3rdparty/masm/stubs/wtf/unicode/Unicode.h
@@ -44,7 +44,7 @@
 #include <QChar>
 
 typedef unsigned char LChar;
-typedef uint16_t UChar;
+typedef unsigned short UChar;
 
 namespace Unicode {
     inline UChar toLower(UChar ch) {
Domain: UI Framework / Qt;