Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk7-b69
authorduke
Wed, 05 Jul 2017 16:58:21 +0200
changeset 3402 1b662b1ed14e
parent 3401 252643c715d2 (diff)
parent 3385 cbdcde6fd82e (current diff)
child 3403 29081e2a6474
child 3404 c20d147ed3c5
child 3406 853a0c7edcb5
child 3408 f8bded136912
child 3410 9c1f8d6372c5
child 3413 d28c3c6955b7
child 3512 ba6fc006ae09
child 3514 110a5f4962ba
child 3517 4313940c8a99
child 3524 ce67848b8aa9
child 3529 278aa22875e2
child 3531 85cfb0185dd8
child 3535 3e41bfcebd62
child 3549 6fec148b493e
child 3638 fbd0a9baa7d4
Merge
--- a/.hgtags-top-repo	Wed Jul 05 16:58:00 2017 +0200
+++ b/.hgtags-top-repo	Wed Jul 05 16:58:21 2017 +0200
@@ -42,3 +42,4 @@
 e01380cd1de4ce048b87d059d238e5ab5e341947 jdk7-b65
 6bad5e3fe50337d95b1416d744780d65bc570da6 jdk7-b66
 c4523c6f82048f420bf0d57c4cd47976753b7d2c jdk7-b67
+e1b972ff53cd58f825791f8ed9b2deffd16e768c jdk7-b68
--- a/corba/.hgtags	Wed Jul 05 16:58:00 2017 +0200
+++ b/corba/.hgtags	Wed Jul 05 16:58:21 2017 +0200
@@ -42,3 +42,4 @@
 97fd9b42f5c2d342b90d18f0a2b57e4117e39415 jdk7-b65
 a821e059a961bcb02830280d51f6dd030425c066 jdk7-b66
 a12ea7c7b497b4ba7830550095ef633bd6f43971 jdk7-b67
+5182bcc9c60cac429d1f7988676cec7320752be3 jdk7-b68
--- a/hotspot/.hgtags	Wed Jul 05 16:58:00 2017 +0200
+++ b/hotspot/.hgtags	Wed Jul 05 16:58:21 2017 +0200
@@ -42,3 +42,4 @@
 ba313800759b678979434d6da8ed3bf49eb8bea4 jdk7-b65
 57c71ad0341b8b64ed20f81151eb7f06324f8894 jdk7-b66
 18f526145aea355a9320b724373386fc2170f183 jdk7-b67
+d07e68298d4e17ebf93d8299e43fcc3ded26472a jdk7-b68
--- a/jaxp/.hgtags	Wed Jul 05 16:58:00 2017 +0200
+++ b/jaxp/.hgtags	Wed Jul 05 16:58:21 2017 +0200
@@ -42,3 +42,4 @@
 008c662e0ee9a91aebb75e46b97de979083d5c1c jdk7-b65
 22f9d5d5b5fe0f47048f41e6c6e54fee5edad0ec jdk7-b66
 a033af8d824a408d3ac602205ecdefc128749e1e jdk7-b67
+83b2a9331383f9db7a49350d4cb13b7635f6b861 jdk7-b68
--- a/jaxws/.hgtags	Wed Jul 05 16:58:00 2017 +0200
+++ b/jaxws/.hgtags	Wed Jul 05 16:58:21 2017 +0200
@@ -42,3 +42,4 @@
 aa22a1be5866a6608ba17a7a443945559409ae0f jdk7-b65
 fa8712c099edd5c9a6b3ed9729353738004d388f jdk7-b66
 faa13cd4d6cdcfb155da5ed23b0da6e0ed0f9ea8 jdk7-b67
+845fa487f0f72a9f232ead8315c0087a477a5a31 jdk7-b68
--- a/jdk/.hgtags	Wed Jul 05 16:58:00 2017 +0200
+++ b/jdk/.hgtags	Wed Jul 05 16:58:21 2017 +0200
@@ -42,3 +42,4 @@
 382a27aa78d3236fa123c60577797a887fe93e09 jdk7-b65
 bd31b30a5b21f20e42965b1633f18a5c7946d398 jdk7-b66
 a952aafd5181af953b0ef3010dbd2fcc28460e8a jdk7-b67
+b23d905cb5d3b382295240d28ab0bfb266b4503c jdk7-b68
--- 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	Wed Jul 05 16:58:21 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;
--- a/langtools/.hgtags	Wed Jul 05 16:58:00 2017 +0200
+++ b/langtools/.hgtags	Wed Jul 05 16:58:21 2017 +0200
@@ -42,3 +42,4 @@
 7e0056ded28c802609d2bd79bfcda551d72a3fec jdk7-b65
 634f519d6f9a602b16bba1c7cd4a17242a8f6889 jdk7-b66
 14b1a8ede95493fc53c37ff2626f1f98ce94d108 jdk7-b67
+95c1212b07e33b1b8c689b1d279d82ffd5a56e43 jdk7-b68
jdk-sandbox