Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8033532: Freetype include statement must come before X11 include
authorihse
Wed, 05 Feb 2014 11:32:27 +0100
changeset 22649 f70b08c1593c
parent 22648 7bcdb55f70ff
child 22650 4d27550a5a27
8033532: Freetype include statement must come before X11 include Reviewed-by: erikj, drchase
jdk/make/lib/Awt2dLibraries.gmk file | annotate | diff | comparison | revisions 
--- a/jdk/make/lib/Awt2dLibraries.gmk	Wed Feb 05 10:20:30 2014 +0000
+++ b/jdk/make/lib/Awt2dLibraries.gmk	Wed Feb 05 11:32:27 2014 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -792,9 +792,9 @@
 endif
 
 BUILD_LIBFONTMANAGER_CFLAGS_COMMON := \
+    $(FONT_HEADERS) \
     $(X_CFLAGS) \
     -DLE_STANDALONE -DHEADLESS \
-    $(FONT_HEADERS) \
     -I$(JDK_TOPDIR)/src/share/native/sun/font \
     -I$(JDK_TOPDIR)/src/share/native/sun/font/layout \
     -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
jdk-sandbox