changeset 3758:472f6c7fbb52

. Fix up the Mac OS specific ContinueInSameThread. Obtained from: macosx-port (Alexander Strange <astrange@apple.com>)
author Greg Lewis <glewis@eyesbeyond.com>
date Tue, 08 Mar 2011 11:50:58 -0800
parents 79f55f85ae1d
children d8a5a62e4ad1
files src/share/bin/java.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/bin/java.c	Tue Mar 08 10:22:56 2011 -0800
+++ b/src/share/bin/java.c	Tue Mar 08 11:50:58 2011 -0800
@@ -122,7 +122,7 @@
 static jboolean RemovableOption(char *option);
 
 #ifdef __APPLE__
-static int ContinueInSameThread(InvocationFunctions* ifn, int argc, char **argv, char *jarfile, char *classname, int ret);
+static int ContinueInSameThread(InvocationFunctions* ifn, int argc, char **argv, int mode, char *what, int ret);
 #endif
 
 /* Maximum supported entries from jvm.cfg. */
@@ -1944,8 +1944,8 @@
 
 #ifdef __APPLE__
 static int
-ContinueInSameThread(InvocationFunctions* ifn, int argc,
-                    char **argv, char *jarfile, char *classname, int ret)
+ContinueInSameThread(InvocationFunctions* ifn, int argc, char **argv,
+		     int mode, char *what, int ret)
 {
         
     /*
@@ -1969,8 +1969,8 @@
         
         args.argc = argc;
         args.argv = argv;
-        args.jarfile = jarfile;
-        args.classname = classname;
+        args.mode = mode;
+        args.what = what;
         args.ifn = *ifn;
         
         rslt = JavaMain((void*)&args);