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

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 3735f75687eb7c7c7ce0d3e79db35c8d8c735116..7b3a48632421b794c8a81379e827586698938f45 100644 (file)
--- 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 ca8265f0df6067bc90a2cf6a61d4442cb64c2200..a0ad08e738fb52985226b1a4cabc9b8fc4eb076f 100644 (file)
--- 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;