# HG changeset patch
# User duke
# Date 1499266695 -7200
# Node ID bd87d94fd8d40bb3025a5005a7a052d80c330087
# Parent  803bf611f5c975536f54ed7a8203e0452e405c93# Parent  824c57d4e19977774c5b9103291823ed8cf49ac0
Merge

diff -r 803bf611f5c9 -r bd87d94fd8d4 .hgtags-top-repo
--- a/.hgtags-top-repo	Thu Aug 06 10:25:10 2009 -0700
+++ b/.hgtags-top-repo	Wed Jul 05 16:58:15 2017 +0200
@@ -42,3 +42,4 @@
 e01380cd1de4ce048b87d059d238e5ab5e341947 jdk7-b65
 6bad5e3fe50337d95b1416d744780d65bc570da6 jdk7-b66
 c4523c6f82048f420bf0d57c4cd47976753b7d2c jdk7-b67
+e1b972ff53cd58f825791f8ed9b2deffd16e768c jdk7-b68
diff -r 803bf611f5c9 -r bd87d94fd8d4 corba/.hgtags
--- a/corba/.hgtags	Thu Aug 06 10:25:10 2009 -0700
+++ b/corba/.hgtags	Wed Jul 05 16:58:15 2017 +0200
@@ -42,3 +42,4 @@
 97fd9b42f5c2d342b90d18f0a2b57e4117e39415 jdk7-b65
 a821e059a961bcb02830280d51f6dd030425c066 jdk7-b66
 a12ea7c7b497b4ba7830550095ef633bd6f43971 jdk7-b67
+5182bcc9c60cac429d1f7988676cec7320752be3 jdk7-b68
diff -r 803bf611f5c9 -r bd87d94fd8d4 hotspot/.hgtags
--- a/hotspot/.hgtags	Thu Aug 06 10:25:10 2009 -0700
+++ b/hotspot/.hgtags	Wed Jul 05 16:58:15 2017 +0200
@@ -42,3 +42,4 @@
 ba313800759b678979434d6da8ed3bf49eb8bea4 jdk7-b65
 57c71ad0341b8b64ed20f81151eb7f06324f8894 jdk7-b66
 18f526145aea355a9320b724373386fc2170f183 jdk7-b67
+d07e68298d4e17ebf93d8299e43fcc3ded26472a jdk7-b68
diff -r 803bf611f5c9 -r bd87d94fd8d4 jdk/.hgtags
--- a/jdk/.hgtags	Thu Aug 06 10:25:10 2009 -0700
+++ b/jdk/.hgtags	Wed Jul 05 16:58:15 2017 +0200
@@ -42,3 +42,4 @@
 382a27aa78d3236fa123c60577797a887fe93e09 jdk7-b65
 bd31b30a5b21f20e42965b1633f18a5c7946d398 jdk7-b66
 a952aafd5181af953b0ef3010dbd2fcc28460e8a jdk7-b67
+b23d905cb5d3b382295240d28ab0bfb266b4503c jdk7-b68
diff -r 803bf611f5c9 -r bd87d94fd8d4 jdk/src/windows/native/sun/jkernel/kernel.cpp
--- a/jdk/src/windows/native/sun/jkernel/kernel.cpp	Thu Aug 06 10:25:10 2009 -0700
+++ b/jdk/src/windows/native/sun/jkernel/kernel.cpp	Wed Jul 05 16:58:15 2017 +0200
@@ -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;