[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: small darwin gdk fix

[Kaffe CVS]

PatchSet 5262 
Date: 2004/10/10 16:28:43
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: small darwin gdk fix

2004-10-10  Dalibor Topic  <robilad at kaffe.org>

        * libraries/clib/awt/classpath-gtk/gtk-peer/gdkfont.h,
        libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c:
        Resynced with GNU Classpath.

        2004-10-10  Andreas Tobler  <a.tobler at schweiz.ch>

        * jni/gtk-peer/gdkfont.h: Mark native_text_layout_state_table extern.
        * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c: Use
        native_text_layout_state_table here.

Members: 
	ChangeLog:1.2815->1.2816 
	libraries/clib/awt/classpath-gtk/gtk-peer/gdkfont.h:1.2->1.3 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2815 kaffe/ChangeLog:1.2816
--- kaffe/ChangeLog:1.2815	Sun Oct 10 14:28:14 2004
+++ kaffe/ChangeLog	Sun Oct 10 16:28:43 2004
@@ -1,5 +1,17 @@
 2004-10-10  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/clib/awt/classpath-gtk/gtk-peer/gdkfont.h,
+	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c:
+	Resynced with GNU Classpath.
+
+	2004-10-10  Andreas Tobler  <a.tobler at schweiz.ch>
+
+        * jni/gtk-peer/gdkfont.h: Mark native_text_layout_state_table extern.
+        * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c: Use
+        native_text_layout_state_table here.
+
+2004-10-10  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/javax/imageio/metadata/IIOInvalidTreeException.java,
 	libraries/javalib/javax/imageio/metadata/IIOMetadataFormatImpl.java,
 	libraries/javalib/javax/imageio/metadata/IIOMetadataNode.java,
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gdkfont.h
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gdkfont.h:1.2 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gdkfont.h:1.3
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gdkfont.h:1.2	Sat Oct  9 22:18:25 2004
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gdkfont.h	Sun Oct 10 16:28:45 2004
@@ -47,7 +47,7 @@
 
 extern struct state_table *native_font_state_table;
 extern struct state_table *native_glyphvector_state_table;
-struct state_table *native_text_layout_state_table;
+extern struct state_table *native_text_layout_state_table;
 
 #define NSA_FONT_INIT(env, clazz) \
   native_font_state_table = init_state_table (env, clazz)
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c:1.1 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c:1.2
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c:1.1	Sat Oct  9 22:18:26 2004
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c	Sun Oct 10 16:28:45 2004
@@ -42,6 +42,8 @@
 #include "gdkfont.h"
 #include "gnu_java_awt_peer_gtk_GdkTextLayout.h"
 
+struct state_table *native_text_layout_state_table;
+
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_initStaticState 
   (JNIEnv *env, jclass clazz)
 {