From: Bryce McKinlay <mckinlay@redhat.com>
Date: Tue, 20 Jul 2004 17:57:58 +0000 (+0000)
Subject: re PR libgcj/16591 (Missing '#ifndef DISABLE_MAIN_ARGS' in _Jv_RunMain (libjava/prims... 
X-Git-Tag: releases/gcc-4.0.0~6455
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f82bb1bed33b152b0093b30b644ae497983b9007;p=thirdparty%2Fgcc.git

re PR libgcj/16591 (Missing '#ifndef DISABLE_MAIN_ARGS' in _Jv_RunMain (libjava/prims.cc))

2004-07-20  Bryce McKinlay  <mckinlay@redhat.com>

	PR libgcj/16591
	* prims.cc (_Jv_RunMain): Don't call _Jv_SetArgs if
	DISABLE_MAIN_ARGS is defined.

From-SVN: r84964
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3735f75687eb..7b3a48632421 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-20  Bryce McKinlay  <mckinlay@redhat.com>
+
+	PR libgcj/16591
+	* prims.cc (_Jv_RunMain): Don't call _Jv_SetArgs if DISABLE_MAIN_ARGS
+	is defined.
+
 2004-07-20  Bryce McKinlay  <mckinlay@redhat.com>
 
 	* java/net/Socket.java (getImpl): Now private. Remove comment.
diff --git a/libjava/prims.cc b/libjava/prims.cc
index ca8265f0df60..a0ad08e738fb 100644
--- a/libjava/prims.cc
+++ b/libjava/prims.cc
@@ -1033,7 +1033,9 @@ void
 _Jv_RunMain (jclass klass, const char *name, int argc, const char **argv, 
 	     bool is_jar)
 {
+#ifndef DISABLE_MAIN_ARGS
   _Jv_SetArgs (argc, argv);
+#endif
 
   java::lang::Runtime *runtime = NULL;