changeset 1463:7e491e39ea0f

6865853: Additional code changes needed to build deploy using WXP SP2 and Visual Studio 2008 Reviewed-by: ohair
author tbell
date Thu, 06 Aug 2009 17:16:31 -0700
parents d8ff2f23a8fc
children 08baaf8638c9
files src/windows/native/sun/jkernel/kernel.cpp
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/native/sun/jkernel/kernel.cpp	Sun Jul 26 19:51:05 2009 -0700
+++ b/src/windows/native/sun/jkernel/kernel.cpp	Thu Aug 06 17:16:31 2009 -0700
@@ -116,11 +116,11 @@
     char *result = NULL;
     size_t len;
     const jchar* utf16 = env->GetStringChars(jstr, NULL);
-    len = wcstombs(NULL, utf16, env->GetStringLength(jstr) * 4) + 1;
+    len = wcstombs(NULL, (const wchar_t*)utf16, env->GetStringLength(jstr) * 4) + 1;
     if (len == -1)
         return NULL;
     result = (char*) malloc(len);
-    if (wcstombs(result, utf16, len) == -1)
+    if (wcstombs(result, (const wchar_t*)utf16, len) == -1)
         return NULL;
     env->ReleaseStringChars(jstr, utf16);
     return result;
@@ -640,7 +640,7 @@
 }
 
 
-void getParent(const TCHAR *path, TCHAR *dest) {
+void getParent(TCHAR *path, TCHAR *dest) {
     char* lastSlash = max(strrchr(path, '\\'), strrchr(path, '/'));
     if (lastSlash == NULL) {
         *dest = NULL;