diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-07-20 17:57:58 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-07-20 17:57:58 +0000 |
| commit | 3eb9e1b33b6600efb8860cc1031dd50786efe591 (patch) | |
| tree | 95c7d95c693ecd85564f9c5a4c35a226ca8ba5b3 /libjava | |
| parent | 7e7d3d2070843d8500dc60e1db8d97daca133c21 (diff) | |
| download | ppe42-gcc-3eb9e1b33b6600efb8860cc1031dd50786efe591.tar.gz ppe42-gcc-3eb9e1b33b6600efb8860cc1031dd50786efe591.zip | |
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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/prims.cc | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 3735f75687e..7b3a4863242 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 ca8265f0df6..a0ad08e738f 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; |
