view patches/ecj/icedtea-pr39408.patch @ 1723:839024180a41

Patch FileDispatcherImpl when PR39408 is present in gjavah. 2009-03-18 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: Enable new PR39408 patch when bug is found in gjavah by configure. * acinclude.m4: (IT_CP39408_JAVAH): Add classpath specification to JAVAC invocation to handle buggy ecjs. * patches/ecj/icedtea-pr39408.patch: New patch to fix build failure when PR39408 is present in gjavah.
author Andrew John Hughes <ahughes@redhat.com>
date Wed, 18 Mar 2009 18:58:02 +0000
parents
children
line wrap: on
line source

diff -Nru openjdk.orig/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c openjdk/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c
--- openjdk-ecj.orig/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c	2009-03-18 16:25:52.000000000 +0000
+++ openjdk-ecj/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c	2009-03-18 16:27:03.000000000 +0000
@@ -36,6 +36,14 @@
 #include "nio.h"
 #include "nio_util.h"
 
+#undef sun_nio_ch_FileDispatcherImpl_NO_LOCK
+#define sun_nio_ch_FileDispatcherImpl_NO_LOCK -1L
+#undef sun_nio_ch_FileDispatcherImpl_LOCKED
+#define sun_nio_ch_FileDispatcherImpl_LOCKED 0L
+#undef sun_nio_ch_FileDispatcherImpl_RET_EX_LOCK
+#define sun_nio_ch_FileDispatcherImpl_RET_EX_LOCK 1L
+#undef sun_nio_ch_FileDispatcherImpl_INTERRUPTED
+#define sun_nio_ch_FileDispatcherImpl_INTERRUPTED 2L
 
 static int preCloseFD = -1;     /* File descriptor to which we dup other fd's
                                    before closing them for real */