summaryrefslogtreecommitdiffstats
path: root/libjava
diff options
context:
space:
mode:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2006-08-09 19:00:54 +0000
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2006-08-09 19:00:54 +0000
commitcc987c956a21db05a1c20b7adf3ee1aa0f50b768 (patch)
treecab36f7ba673260962f062289fccd2db8c61b040 /libjava
parent6f32df61628a88355a00959ad22e60c0ccccd9ce (diff)
downloadppe42-gcc-cc987c956a21db05a1c20b7adf3ee1aa0f50b768.tar.gz
ppe42-gcc-cc987c956a21db05a1c20b7adf3ee1aa0f50b768.zip
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@116044 138bc75d-0d04-0410-961f-82ee72b054a4
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 62b20718204..db24f538ace 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 965fb5a2342..4053ad8b6f2 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. */
OpenPOWER on IntegriCloud