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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@84964 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3735f75..7b3a486 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,11 @@
 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.
 
 2004-07-20  Bryce McKinlay  <mckinlay@redhat.com>

diff --git a/libjava/prims.cc b/libjava/prims.cc
index ca8265f..a0ad08e 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;