diff options
| author | Matthias Klose <doko@ubuntu.com> | 2013-11-29 16:53:39 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@ubuntu.com> | 2013-11-29 16:53:39 +0000 |
| commit | bf3fd651244f28e372b3dfccaff29f7d1e756fff (patch) | |
| tree | f1b3e70f9f037e702a2fea352bb26dc32abeefe1 /libjava/classpath | |
| parent | 2aa1a344bf742d5bcba6ed4e72d3b36922b47b2c (diff) | |
2013-11-29 Matthias Klose <doko@ubuntu.com>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c,
native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c:
Fix freetype includes.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@205533 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath')
3 files changed, 14 insertions, 6 deletions
diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index 63955543ca8..62e985b9734 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,3 +1,9 @@ +2013-11-29 Matthias Klose <doko@ubuntu.com> + + * native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c, + native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c: + Fix freetype includes. + 2013-04-16 Andreas Schwab <schwab@suse.de> * native/fdlibm/ieeefp.h: Add support for aarch64. diff --git a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c index cb7bf43dcb4..e74678ef6cd 100644 --- a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c +++ b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c @@ -42,8 +42,9 @@ exception statement from your version. */ #include <pango/pango.h> #include <pango/pangoft2.h> #include <pango/pangofc-font.h> -#include <freetype/ftglyph.h> -#include <freetype/ftoutln.h> +#include <ft2build.h> +#include FT_GLYPH_H +#include FT_OUTLINE_H #include "jcl.h" #include "gdkfont.h" #include "gnu_java_awt_peer_gtk_FreetypeGlyphVector.h" diff --git a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c index 771b23e3738..cfd988c4a52 100644 --- a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c +++ b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c @@ -39,10 +39,11 @@ #include <pango/pango.h> #include <pango/pangoft2.h> #include <pango/pangofc-font.h> -#include <freetype/ftglyph.h> -#include <freetype/ftoutln.h> -#include <freetype/fttypes.h> -#include <freetype/tttables.h> +#include <ft2build.h> +#include FT_GLYPH_H +#include FT_OUTLINE_H +#include FT_TYPES_H +#include FT_TRUETYPE_TABLES_H #include "gdkfont.h" #include "gtkpeer.h" #include "gnu_java_awt_peer_gtk_GdkFontPeer.h" |