aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog6
-rw-r--r--libjava/prims.cc2
2 files changed, 8 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3735f75..7b3a486 100644
--- 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
--- 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;