aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2006-08-09 19:00:54 +0000
committerTom Tromey <tromey@gcc.gnu.org>2006-08-09 19:00:54 +0000
commit1506961e116059cbf6acbf80e699b280bc680a94 (patch)
treecab36f7ba673260962f062289fccd2db8c61b040 /libjava
parent2d8ba2c76b324d0a4328520a825160034cfb8fff (diff)
downloadgcc-1506961e116059cbf6acbf80e699b280bc680a94.zip
gcc-1506961e116059cbf6acbf80e699b280bc680a94.tar.gz
gcc-1506961e116059cbf6acbf80e699b280bc680a94.tar.bz2
re PR awt/28666 (IllegalAccessError in gtk peers)
PR classpath/28666: * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c (Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeGetDisplayModes): Create a 'short' array. From-SVN: r116044
Diffstat (limited to 'libjava')
-rw-r--r--libjava/classpath/ChangeLog.gcj7
-rw-r--r--libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index 62b2071..db24f53 100644
--- a/libjava/classpath/ChangeLog.gcj
+++ b/libjava/classpath/ChangeLog.gcj
@@ -1,3 +1,10 @@
+2006-08-09 Tom Tromey <tromey@redhat.com>
+
+ PR classpath/28666:
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c
+ (Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeGetDisplayModes):
+ Create a 'short' array.
+
2006-08-07 Tom Tromey <tromey@redhat.com>
PR libgcj/28609:
diff --git a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c
index 965fb5a..4053ad8 100644
--- a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c
+++ b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c
@@ -248,8 +248,8 @@ Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeGetDisplayModes
/* Retrieves refresh rate information. */
rates = XRRConfigRates(config, i, &nrates);
- /* Create a Java int array and put them in. */
- shortArray = (*env)->NewIntArray(env, nrates);
+ /* Create a Java short array and put them in. */
+ shortArray = (*env)->NewShortArray(env, nrates);
(*env)->SetShortArrayRegion(env, shortArray, 0, nrates, (jshort *) rates);
/* Create a GdkScreenGraphicsDevice.X11DisplayMode instance. */