diff options
| author | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-11 13:54:49 +0000 |
|---|---|---|
| committer | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-11 13:54:49 +0000 |
| commit | a1fefa1d0661268691bd31ede4852d7699448262 (patch) | |
| tree | 5fc380aa4ccb171608a6812ecebb5e079cf0f3f9 /libjava/prims.cc | |
| parent | d45318b3f91ca785bfca5d465288dea73ed0aa26 (diff) | |
| download | gcc-a1fefa1d0661268691bd31ede4852d7699448262.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120672 138bc75d-0d04-0410-961f-82ee72b054a4
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 3f88fb7db76..00d547017f4 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 |