author | tbell |
Thu, 06 Aug 2009 17:26:35 -0700 | |
changeset 3391 | 176b0c40eacc |
parent 3390 | 81d19041f09f (diff) |
parent 3384 | bca2225b66d7 (current diff) |
child 3392 | e0b23259a484 |
jdk/src/share/classes/com/sun/crypto/provider/JarVerifier.java | file | annotate | diff | comparison | revisions | |
jdk/src/share/classes/javax/swing/plaf/basic/DesktopIconMover.java | file | annotate | diff | comparison | revisions | |
jdk/src/share/classes/sun/security/pkcs11/JarVerifier.java | file | annotate | diff | comparison | revisions | |
jdk/src/windows/classes/sun/security/mscapi/JarVerifier.java | file | annotate | diff | comparison | revisions | |
langtools/src/share/classes/com/sun/mirror/apt/package.html | file | annotate | diff | comparison | revisions | |
langtools/src/share/classes/com/sun/mirror/declaration/package.html | file | annotate | diff | comparison | revisions | |
langtools/src/share/classes/com/sun/mirror/type/package.html | file | annotate | diff | comparison | revisions | |
langtools/src/share/classes/com/sun/mirror/util/package.html | file | annotate | diff | comparison | revisions |
--- a/jdk/src/windows/native/sun/jkernel/kernel.cpp Wed Jul 05 16:58:00 2017 +0200 +++ b/jdk/src/windows/native/sun/jkernel/kernel.cpp Thu Aug 06 17:26:35 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;