Changeset 199278 in webkit

Timestamp:

Apr 9, 2016 6:46:27 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Fixed compilation of JPEGImageDecoder with libjpeg v9.
​https://bugs.webkit.org/show_bug.cgi?id=156445

Patch by Konstantin Tokarev <Konstantin Tokarev> 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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/image-decoders/jpeg/JPEGImageDecoder.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-04-09  Konstantin Tokarev  <annulen@yandex.ru>
+
+        Fixed compilation of JPEGImageDecoder with libjpeg v9.
+        https://bugs.webkit.org/show_bug.cgi?id=156445
+
+        Reviewed by Michael Catanzaro.
+
+        ICU defines TRUE and FALSE macros, breaking libjpeg v9 headers.
+
+        No new tests needed.
+
+        * platform/image-decoders/jpeg/JPEGImageDecoder.h:
+
 2016-04-09  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h

@@ -31 +31 @@
 #include <stdio.h> // Needed by jpeglib.h for FILE.
 
+// ICU defines TRUE and FALSE macros, breaking libjpeg v9 headers
+#undef TRUE
+#undef FALSE
 extern "C" {
 #include "jpeglib.h"