Mercurial > hg > release > icedtea-1.10
view patches/ecj/icedtea-pr39408.patch @ 1813:5adda0d4b9f5
Fix ecj build where gcj 4.3 or 4.4 is used.
2009-05-21 Andrew John Hughes <ahughes@redhat.com>
* patches/ecj/icedtea-pr39408.patch:
Updated to put the file in the state
where PR40188 is present so that gcj 4.3/4.4
builds work.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Thu, 21 May 2009 17:09:13 +0100 |
| parents | 839024180a41 |
| 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_FileDispatcher_NO_LOCK +#define sun_nio_ch_FileDispatcher_NO_LOCK -1L +#undef sun_nio_ch_FileDispatcher_LOCKED +#define sun_nio_ch_FileDispatcher_LOCKED 0L +#undef sun_nio_ch_FileDispatcher_RET_EX_LOCK +#define sun_nio_ch_FileDispatcher_RET_EX_LOCK 1L +#undef sun_nio_ch_FileDispatcher_INTERRUPTED +#define sun_nio_ch_FileDispatcher_INTERRUPTED 2L static int preCloseFD = -1; /* File descriptor to which we dup other fd's before closing them for real */