diff -r 000000000000 -r 6474c204b198 gfx/2d/Makefile.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gfx/2d/Makefile.in	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,17 @@
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),$(findstring $(MOZ_WIDGET_TOOLKIT),android gtk2 gtk3 gonk qt))
+OS_CXXFLAGS += $(CAIRO_FT_CFLAGS)
+endif
+
+include $(topsrcdir)/config/rules.mk
+
+# Due to bug 796023, we can't have -DUNICODE and -D_UNICODE; defining those
+# macros changes the type of LOGFONT to LOGFONTW instead of LOGFONTA. This
+# changes the symbol names of exported C++ functions that use LOGFONT.
+DEFINES := $(filter-out -DUNICODE -D_UNICODE,$(DEFINES))
+
+CXXFLAGS += $(MOZ_CAIRO_CFLAGS)