# HG changeset patch
# User asaha
# Date 1249926614 25200
# Node ID 110a5f4962ba0fe55ad397ef4e744c88d227072f
# Parent  049b8aa6f04d86d7a2c958e4154a51a322ae9107# Parent  1b662b1ed14eb4ae31d5138a36c433b13d941dc5
Merge

diff -r 049b8aa6f04d -r 110a5f4962ba .hgtags
--- a/.hgtags	Fri Aug 07 11:31:35 2009 -0700
+++ b/.hgtags	Mon Aug 10 10:50:14 2009 -0700
@@ -42,3 +42,4 @@
 7d3bf00f3cc4f8125de1842521e7567f37dc84b8 jdk7-b65
 62109d1b9e7310f29ab51ca6f1d71b899c0ce6b0 jdk7-b66
 eb24af1404aec8aa140c4cd4d13d2839b150dd41 jdk7-b67
+bca2225b66d78c4bf4d9801f54cac7715a598650 jdk7-b68
diff -r 049b8aa6f04d -r 110a5f4962ba .hgtags-top-repo
--- a/.hgtags-top-repo	Fri Aug 07 11:31:35 2009 -0700
+++ b/.hgtags-top-repo	Mon Aug 10 10:50:14 2009 -0700
@@ -42,3 +42,4 @@
 e01380cd1de4ce048b87d059d238e5ab5e341947 jdk7-b65
 6bad5e3fe50337d95b1416d744780d65bc570da6 jdk7-b66
 c4523c6f82048f420bf0d57c4cd47976753b7d2c jdk7-b67
+e1b972ff53cd58f825791f8ed9b2deffd16e768c jdk7-b68
diff -r 049b8aa6f04d -r 110a5f4962ba corba/.hgtags
--- a/corba/.hgtags	Fri Aug 07 11:31:35 2009 -0700
+++ b/corba/.hgtags	Mon Aug 10 10:50:14 2009 -0700
@@ -42,3 +42,4 @@
 97fd9b42f5c2d342b90d18f0a2b57e4117e39415 jdk7-b65
 a821e059a961bcb02830280d51f6dd030425c066 jdk7-b66
 a12ea7c7b497b4ba7830550095ef633bd6f43971 jdk7-b67
+5182bcc9c60cac429d1f7988676cec7320752be3 jdk7-b68
diff -r 049b8aa6f04d -r 110a5f4962ba hotspot/.hgtags
--- a/hotspot/.hgtags	Fri Aug 07 11:31:35 2009 -0700
+++ b/hotspot/.hgtags	Mon Aug 10 10:50:14 2009 -0700
@@ -42,3 +42,4 @@
 ba313800759b678979434d6da8ed3bf49eb8bea4 jdk7-b65
 57c71ad0341b8b64ed20f81151eb7f06324f8894 jdk7-b66
 18f526145aea355a9320b724373386fc2170f183 jdk7-b67
+d07e68298d4e17ebf93d8299e43fcc3ded26472a jdk7-b68
diff -r 049b8aa6f04d -r 110a5f4962ba jaxp/.hgtags
--- a/jaxp/.hgtags	Fri Aug 07 11:31:35 2009 -0700
+++ b/jaxp/.hgtags	Mon Aug 10 10:50:14 2009 -0700
@@ -42,3 +42,4 @@
 008c662e0ee9a91aebb75e46b97de979083d5c1c jdk7-b65
 22f9d5d5b5fe0f47048f41e6c6e54fee5edad0ec jdk7-b66
 a033af8d824a408d3ac602205ecdefc128749e1e jdk7-b67
+83b2a9331383f9db7a49350d4cb13b7635f6b861 jdk7-b68
diff -r 049b8aa6f04d -r 110a5f4962ba jaxws/.hgtags
--- a/jaxws/.hgtags	Fri Aug 07 11:31:35 2009 -0700
+++ b/jaxws/.hgtags	Mon Aug 10 10:50:14 2009 -0700
@@ -42,3 +42,4 @@
 aa22a1be5866a6608ba17a7a443945559409ae0f jdk7-b65
 fa8712c099edd5c9a6b3ed9729353738004d388f jdk7-b66
 faa13cd4d6cdcfb155da5ed23b0da6e0ed0f9ea8 jdk7-b67
+845fa487f0f72a9f232ead8315c0087a477a5a31 jdk7-b68
diff -r 049b8aa6f04d -r 110a5f4962ba jdk/.hgtags
--- a/jdk/.hgtags	Fri Aug 07 11:31:35 2009 -0700
+++ b/jdk/.hgtags	Mon Aug 10 10:50:14 2009 -0700
@@ -42,3 +42,4 @@
 382a27aa78d3236fa123c60577797a887fe93e09 jdk7-b65
 bd31b30a5b21f20e42965b1633f18a5c7946d398 jdk7-b66
 a952aafd5181af953b0ef3010dbd2fcc28460e8a jdk7-b67
+b23d905cb5d3b382295240d28ab0bfb266b4503c jdk7-b68
diff -r 049b8aa6f04d -r 110a5f4962ba jdk/src/windows/native/sun/jkernel/kernel.cpp
--- a/jdk/src/windows/native/sun/jkernel/kernel.cpp	Fri Aug 07 11:31:35 2009 -0700
+++ b/jdk/src/windows/native/sun/jkernel/kernel.cpp	Mon Aug 10 10:50:14 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;
diff -r 049b8aa6f04d -r 110a5f4962ba langtools/.hgtags
--- a/langtools/.hgtags	Fri Aug 07 11:31:35 2009 -0700
+++ b/langtools/.hgtags	Mon Aug 10 10:50:14 2009 -0700
@@ -42,3 +42,4 @@
 7e0056ded28c802609d2bd79bfcda551d72a3fec jdk7-b65
 634f519d6f9a602b16bba1c7cd4a17242a8f6889 jdk7-b66
 14b1a8ede95493fc53c37ff2626f1f98ce94d108 jdk7-b67
+95c1212b07e33b1b8c689b1d279d82ffd5a56e43 jdk7-b68