X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=libjava%2Fprims.cc;h=00d547017f46ae35466c715261ec49dc7eea6393;hp=3f88fb7db764222c544f721bf2859853e9003004;hb=a1fefa1d0661268691bd31ede4852d7699448262;hpb=d45318b3f91ca785bfca5d465288dea73ed0aa26

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