changeset in /hg/icedtea: Fix ecj build where gcj 4.3 or 4.4 is ...

[Andrew John Hughes]

changeset 5adda0d4b9f5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5adda0d4b9f5
description:
	Fix ecj build where gcj 4.3 or 4.4 is used.

	2009-05-21  Andrew John Hughes  <ahughes at 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.

diffstat:

2 files changed, 15 insertions(+), 8 deletions(-)
ChangeLog                         |    7 +++++++
patches/ecj/icedtea-pr39408.patch |   16 ++++++++--------

diffs (40 lines):

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  <ahughes
+2009-05-21  Andrew John Hughes  <ahughes at redhat.com>
+
+	* 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  <ahughes at redhat.com>
 
 	* 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 @@ diff -Nru openjdk.orig/jdk/src/solaris/n
  #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 */