changeset in /hg/icedtea: * patches/icedtea-cacao.patch: Updated...

[Christian Thalinger]

changeset 37c4bc769489 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=37c4bc769489
description:
	* patches/icedtea-cacao.patch: Updated for OpenJDK 6.

diffstat:

1 file changed, 10 insertions(+), 11 deletions(-)
patches/icedtea-cacao.patch |   21 ++++++++++-----------

diffs (27 lines):

diff -r 162a0882c704 -r 37c4bc769489 patches/icedtea-cacao.patch
--- a/patches/icedtea-cacao.patch	Mon Mar 17 16:06:17 2008 +0100
+++ b/patches/icedtea-cacao.patch	Mon Mar 17 16:58:26 2008 +0100
@@ -1,13 +1,12 @@ diff -r 37a05a11f281 src/share/bin/java.
-diff -r 37a05a11f281 src/share/bin/java.c
---- origopenjdk/jdk/src/share/bin/java.c	Sat Dec 01 00:00:00 2007 +0000
-+++ openjdk/jdk/src/share/bin/java.c	Tue Jan 15 16:13:54 2008 +0100
-@@ -1955,7 +1955,8 @@ ContinueInNewThread(InvocationFunctions*
+--- ../icedtea6/openjdk/jdk/src/share/bin/java.c        2008-02-28 10:42:00.000000000 +0100
++++ openjdk/jdk/src/share/bin/java.c    2008-03-17 16:23:05.804846720 +0100
+@@ -367,7 +367,8 @@
        args.classname = classname;
-       args.ifn = *ifn;
+       args.ifn = ifn;
  
--      rslt = ContinueInNewThread0(JavaMain, threadStackSize, (void*)&args);
-+/*       rslt = ContinueInNewThread0(JavaMain, threadStackSize, (void*)&args); */
-+      rslt = JavaMain((void*)&args);
-       /* If the caller has deemed there is an error we
-        * simply return that, otherwise we return the value of
-        * the callee
+-      return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args, ret);
++/*       return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args, ret); */
++      return JavaMain((void*)&args);
+     }
+ }
+