Mercurial > hg > release > icedtea-1.10

changeset 1813:5adda0d4b9f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 f915b5bb3fc7
children a9c10241b227
files ChangeLog patches/ecj/icedtea-pr39408.patch
diffstat 2 files changed, 15 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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@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@redhat.com>
 
 	* patches/icedtea-stop-nimbus-generation.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 */