From 0d9cb5e7752e01a84db2906eec4e60bcaa85c4c3 Mon Sep 17 00:00:00 2001 From: Phil Race Date: Thu, 5 Apr 2012 15:17:19 -0700 Subject: [PATCH] 7159136: JDK 7 font manager refactoring left JNI header generation and inclusion out of sync Reviewed-by: igor, jgodinez --- jdk/make/sun/font/Makefile | 2 +- jdk/make/sun/font/t2k/Makefile | 1 - jdk/src/share/native/sun/font/sunFont.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/jdk/make/sun/font/Makefile b/jdk/make/sun/font/Makefile index 385e2028270..f797a5ba010 100644 --- a/jdk/make/sun/font/Makefile +++ b/jdk/make/sun/font/Makefile @@ -62,7 +62,7 @@ FILES_export = \ java/text/Bidi.java \ sun/font/FileFont.java \ sun/font/FileFontStrike.java \ - sun/font/FontManager.java \ + sun/font/SunFontManager.java \ sun/font/GlyphList.java \ sun/font/NativeFont.java \ sun/font/StrikeCache.java \ diff --git a/jdk/make/sun/font/t2k/Makefile b/jdk/make/sun/font/t2k/Makefile index 71903e0f774..0827baf89c9 100644 --- a/jdk/make/sun/font/t2k/Makefile +++ b/jdk/make/sun/font/t2k/Makefile @@ -52,7 +52,6 @@ include FILES_c.gmk FILES_export = \ java/awt/Font.java \ sun/font/FileFont.java \ - sun/font/FontManager.java \ sun/font/GlyphList.java \ sun/font/NativeFont.java \ sun/font/StrikeCache.java \ diff --git a/jdk/src/share/native/sun/font/sunFont.c b/jdk/src/share/native/sun/font/sunFont.c index e6ce37f6b77..cfcc5ed75c0 100644 --- a/jdk/src/share/native/sun/font/sunFont.c +++ b/jdk/src/share/native/sun/font/sunFont.c @@ -29,7 +29,7 @@ #include "jlong.h" #include "sunfontids.h" #include "fontscalerdefs.h" -#include "sun_font_FontManager.h" +#include "sun_font_SunFontManager.h" #include "sun_font_NullFontScaler.h" #include "sun_font_StrikeCache.h"