diff options
| author | Andrew Haley <aph@redhat.com> | 2007-01-11 13:54:49 +0000 |
|---|---|---|
| committer | Andrew Haley <aph@gcc.gnu.org> | 2007-01-11 13:54:49 +0000 |
| commit | 9d5b51ff57093d6f49583ad96363b45a26db59dc (patch) | |
| tree | 5fc380aa4ccb171608a6812ecebb5e079cf0f3f9 /libjava/prims.cc | |
| parent | e69bf64be925b71e9ba7e6ab13787b672f359ff4 (diff) | |
| download | gcc-9d5b51ff57093d6f49583ad96363b45a26db59dc.zip gcc-9d5b51ff57093d6f49583ad96363b45a26db59dc.tar.gz gcc-9d5b51ff57093d6f49583ad96363b45a26db59dc.tar.bz2 | |
2007-01-11 Andrew Haley <aph@redhat.com>
* prims.cc (jdwpOptions) Fix deprecated cast from char[] constant
to char*.
* include/x86_64-signal.h (HANDLE_DIVIDE_OVERFLOW): Rewrite to fix
aliasing violation.
From-SVN: r120672
Diffstat (limited to 'libjava/prims.cc')
| -rw-r--r-- | libjava/prims.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libjava/prims.cc b/libjava/prims.cc index 3f88fb7..00d5470 100644 --- a/libjava/prims.cc +++ b/libjava/prims.cc @@ -87,7 +87,7 @@ static java::lang::OutOfMemoryError *no_memory; // Number of bytes in largest array object we create. This could be // increased to the largest size_t value, so long as the appropriate // functions are changed to take a size_t argument instead of jint. -#define MAX_OBJECT_SIZE ((1<<31) - 1) +#define MAX_OBJECT_SIZE (((size_t)1<<31) - 1) // Properties set at compile time. const char **_Jv_Compiler_Properties = NULL; @@ -104,7 +104,8 @@ int _Jv_argc; // Debugging options static bool remoteDebug = false; -static char *jdwpOptions = ""; +static char defaultJdwpOptions[] = ""; +static char *jdwpOptions = defaultJdwpOptions; // Argument support. int |