summaryrefslogtreecommitdiff
path: root/libre/java7-openjdk/i586-fix.diff
diff options
context:
space:
mode:
Diffstat (limited to 'libre/java7-openjdk/i586-fix.diff')
-rw-r--r--libre/java7-openjdk/i586-fix.diff21
1 files changed, 21 insertions, 0 deletions
diff --git a/libre/java7-openjdk/i586-fix.diff b/libre/java7-openjdk/i586-fix.diff
new file mode 100644
index 000000000..61ff56e95
--- /dev/null
+++ b/libre/java7-openjdk/i586-fix.diff
@@ -0,0 +1,21 @@
+diff -r ff3cd846027a src/solaris/native/sun/java2d/x11/X11SurfaceData.c
+--- openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c Sun Jul 19 18:19:29 2015 +0100
++++ openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c Thu Jul 30 14:31:59 2015 +0200
+@@ -551,8 +551,6 @@
+ {
+ XImage *img = NULL;
+ XShmSegmentInfo *shminfo;
+- JNIEnv* env;
+- jboolean xShmAttachResult;
+
+ shminfo = malloc(sizeof(XShmSegmentInfo));
+ if (shminfo == NULL) {
+@@ -603,7 +601,7 @@
+ */
+ shmctl(shminfo->shmid, IPC_RMID, 0);
+
+- if (xShmAttachResult == JNI_FALSE) {
++ if (isXShmAttachFailed() == JNI_TRUE) {
+ J2dRlsTraceLn1(J2D_TRACE_ERROR,
+ "X11SD_SetupSharedSegment XShmAttach has failed: %s",
+ strerror(errno));