Some Gtk code uses defined(USE_FREETYPE) instead of just USE(FREETYPE) platform/graphics/cairo/OwnPtrCairo.cpp:#if defined(USE_FREETYPE) platform/graphics/cairo/OwnPtrCairo.cpp:#if defined(USE_FREETYPE) platform/graphics/cairo/OwnPtrCairo.h:#if defined(USE_FREETYPE) platform/graphics/cairo/OwnPtrCairo.h:#if defined(USE_FREETYPE) platform/graphics/cairo/RefPtrCairo.cpp:#if defined(USE_FREETYPE) platform/graphics/cairo/RefPtrCairo.cpp:#if defined(USE_FREETYPE) platform/graphics/cairo/RefPtrCairo.h:#if defined(USE_FREETYPE) platform/graphics/cairo/RefPtrCairo.h:#if defined(USE_FREETYPE) platform/graphics/gtk/FontGtk.cpp:#if defined(USE_FREETYPE) platform/graphics/gtk/FontGtk.cpp:#if defined(USE_FREETYPE) platform/graphics/gtk/FontGtk.cpp:#if defined(USE_FREETYPE) platform/graphics/gtk/FontGtk.cpp:#if defined(USE_FREETYPE) platform/graphics/gtk/FontGtk.cpp:#if defined(USE_FREETYPE) platform/graphics/gtk/FontGtk.cpp:#if defined(USE_FREETYPE) Seems like a typo/misunderstanding?
Actually, that would fail due to USE(FOO) assumes WTF_USE_FOO. I wonder where we're getting USE_FREETYPE from.
(In reply to comment #1) > Actually, that would fail due to USE(FOO) assumes WTF_USE_FOO. I wonder where we're getting USE_FREETYPE from. It is defined in the Source/WebCore/GNUmakefile.am: if USE_FREETYPE webcoregtk_cppflags += \ -DUSE_FREETYPE=1 \ -I$(srcdir)/Source/WebCore/platform/graphics/freetype ... I think it is just an oversight, I would say we should use the macro USE.
Created attachment 85368 [details] Proposed patch I've added also the USE_PANGO define to the patch.
Comment on attachment 85368 [details] Proposed patch Great. Thanks for the cleanup.
Comment on attachment 85368 [details] Proposed patch Clearing flags on attachment: 85368 Committed r80744: <http://trac.webkit.org/changeset/80744>
All reviewed patches have been landed. Closing bug.