# HG changeset patch
# User ohair
# Date 1241807057 25200
# Node ID 8f7662a823396fe6c5825e34631e1fee1d707c26
# Parent  8a0d0b5c3e73c305982fa65b3c256b950b86174b# Parent  8ceb16c7fbf305fc37b9129be1ca619e1d330b0e
Merge

diff -r 8a0d0b5c3e73 -r 8f7662a82339 jdk/src/windows/native/sun/windows/awt_Window.cpp
--- a/jdk/src/windows/native/sun/windows/awt_Window.cpp	Thu May 07 12:26:22 2009 -0700
+++ b/jdk/src/windows/native/sun/windows/awt_Window.cpp	Fri May 08 11:24:17 2009 -0700
@@ -464,7 +464,8 @@
         size_t length = env->GetStringLength(javaWarningString) + 1;
         warningString = new WCHAR[length];
         env->GetStringRegion(javaWarningString, 0,
-                static_cast<jsize>(length - 1), warningString);
+                static_cast<jsize>(length - 1),
+                reinterpret_cast<jchar*>(warningString));
         warningString[length-1] = L'\0';
 
         env->DeleteLocalRef(javaWarningString);