diff options
| author | Bryce McKinlay <mckinlay@redhat.com> | 2004-07-20 17:57:58 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2004-07-20 18:57:58 +0100 |
| commit | f82bb1bed33b152b0093b30b644ae497983b9007 (patch) | |
| tree | 95c7d95c693ecd85564f9c5a4c35a226ca8ba5b3 | |
| parent | f6bbce40a3285d8763286775b32827cebed57dea (diff) | |
| download | gcc-f82bb1bed33b152b0093b30b644ae497983b9007.zip gcc-f82bb1bed33b152b0093b30b644ae497983b9007.tar.gz gcc-f82bb1bed33b152b0093b30b644ae497983b9007.tar.bz2 | |
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
| -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 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; |