[kaffe] CVS kaffe (robilad): Resynced wih GNU Claspath: fix for cairo includes

[Kaffe CVS]

PatchSet 5974 
Date: 2005/02/05 14:28:57
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced wih GNU Claspath: fix for cairo includes

2005-02-05  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-02-03  Michael Koch  <konqueror at gmx.de>

        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c
        Fix includes for cairo 0.3.0 snappshot.

Members: 
	ChangeLog:1.3513->1.3514 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c:1.9->1.10 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3513 kaffe/ChangeLog:1.3514
--- kaffe/ChangeLog:1.3513	Sat Feb  5 09:54:48 2005
+++ kaffe/ChangeLog	Sat Feb  5 14:28:57 2005
@@ -1,5 +1,14 @@
 2005-02-05  Dalibor Topic  <robilad at kaffe.org>
 
+	Resynced with GNU Classpath.
+
+	2005-02-03  Michael Koch  <konqueror at gmx.de>
+
+        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c
+        Fix includes for cairo 0.3.0 snappshot.
+
+2005-02-05  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/clib/native/gnu_classpath_VMSystemProperties.c
 	Use UNUSED instead of using the gcc attribute explicitely.
 
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c:1.9 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c:1.10
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c:1.9	Sat Jan 22 18:24:58 2005
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c	Sat Feb  5 14:30:20 2005
@@ -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>