# HG changeset patch # User Andrew John Hughes # Date 1242922153 -3600 # Node ID 5adda0d4b9f56b82f2ba920634367132f81c4cb2 # Parent f915b5bb3fc715d7d928a00f4e7ed944e26078af Fix ecj build where gcj 4.3 or 4.4 is used. 2009-05-21 Andrew John Hughes * 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. diff -r f915b5bb3fc7 -r 5adda0d4b9f5 ChangeLog --- a/ChangeLog Thu May 21 16:44:10 2009 +0100 +++ b/ChangeLog Thu May 21 17:09:13 2009 +0100 @@ -1,3 +1,10 @@ +2009-05-21 Andrew John Hughes + + * patches/ecj/icedtea-pr39408.patch: + Updated to put the file in the state + where PR40188 is present so that gcj 4.3 + builds work. + 2009-05-21 Andrew John Hughes * patches/icedtea-stop-nimbus-generation.patch: diff -r f915b5bb3fc7 -r 5adda0d4b9f5 patches/ecj/icedtea-pr39408.patch --- a/patches/ecj/icedtea-pr39408.patch Thu May 21 16:44:10 2009 +0100 +++ b/patches/ecj/icedtea-pr39408.patch Thu May 21 17:09:13 2009 +0100 @@ -5,14 +5,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 ++#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 */