diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2016-04-10 01:46:27 +0000 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2016-04-20 11:35:41 +0000 |
| commit | 4d435a7c294703e7a4a48cc962bc4f2a8db3f9c0 (patch) | |
| tree | c159cf661c728db8cc58641f5e530acf81ee5a0a | |
| parent | b555ab7169f23d47fe980aa0c76c0eb9d18d6ab1 (diff) | |
| download | qtwebkit-4d435a7c294703e7a4a48cc962bc4f2a8db3f9c0.tar.gz | |
Fixed compilation of JPEGImageDecoder with libjpeg v9.
https://bugs.webkit.org/show_bug.cgi?id=156445
Patch by Konstantin Tokarev <annulen@yandex.ru> on 2016-04-09
Reviewed by Michael Catanzaro.
ICU defines TRUE and FALSE macros, breaking libjpeg v9 headers.
No new tests needed.
* platform/image-decoders/jpeg/JPEGImageDecoder.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@199278 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Change-Id: I82db8bae210f8b03bd472a82925bd308fa01b6ca
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| -rw-r--r-- | Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h index b1f61a14d..3231eedba 100644 --- a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h +++ b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h @@ -40,6 +40,9 @@ #define XMD_H #endif +// ICU defines TRUE and FALSE macros, breaking libjpeg v9 headers +#undef TRUE +#undef FALSE extern "C" { #include "jpeglib.h" } |