diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2005-02-04 09:44:43 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2005-02-04 09:44:43 +0000 |
| commit | b721b6341331d70c0a3d128f6187617730864e10 (patch) | |
| tree | 4399a91216f1a1fb059fda1c8292e65232db325f /native/jni | |
| parent | 09e1739c3f6893f9b615916faee706130ccfd95e (diff) | |
| download | classpath-b721b6341331d70c0a3d128f6187617730864e10.tar.gz | |
2005-02-04 Andrew John Hughes <gnu_andrew@member.fsf.org>
Merge of HEAD --> generics-branch for 03/02/2005.
Changelog:
2005-02-03 Robert Schuster <thebohemian@gmx.net>
* gnu/java/nio/charset/ISO_8859_1.java,
gnu/java/nio/charset/US_ASCII.java,
gnu/java/nio/charset/UTF_16.java,
gnu/java/nio/charset/UTF_16_LE.java,
gnu/java/nio/charset/UTF_16_BE.java,
gnu/java/nio/charset/UTF_8.java: Fixed canonical names
and aliases according to
"http://www.iana.org/assignments/character-sets",
"http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html"
and "http://oss.software.ibm.com/cgi-bin/icu/convexp?s=ALL".
* gnu/java/nio/charset/Provider.java: Made charset lookup
case-insensitive which fixes bug #11740.
2005-02-03 Dalibor Topic <robilad@kaffe.org>
* libraries/javalib/gnu/regexp/RE.java,
libraries/javalib/java/io/ObjectInputStream.java,
libraries/javalib/java/io/ObjectStreamClass.java,
libraries/javalib/java/lang/SecurityManager.java,
libraries/javalib/java/security/AllPermission.java,
libraries/javalib/java/security/BasicPermission.java,
libraries/javalib/java/security/Permissions.java,
libraries/javalib/java/text/MessageFormat.java,
libraries/javalib/java/util/AbstractList.java:
Made 'inner' classes real public static inner classes,
and made them final where possible, or removed them
where unused.
2005-02-03 Michael Koch <konqueror@gmx.de>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c
Fix includes for cairo 0.3.0 snappshot.
Diffstat (limited to 'native/jni')
| -rw-r--r-- | native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c index 7a7c03e86..13d0323f1 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c @@ -1,5 +1,5 @@ /* gnu_java_awt_peer_gtk_GdkGraphics2d.c - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,7 +45,8 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixdata.h> -#include <cairo.h> +#include <cairo-ft.h> +#include <cairo-xlib.h> #include <stdio.h> #include <stdlib.h> |