--- a/jdk/src/java.base/windows/native/libjava/java_props_md.c	Fri May 22 16:13:00 2015 +0300
+++ b/jdk/src/java.base/windows/native/libjava/java_props_md.c	Fri May 22 10:12:18 2015 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -345,6 +345,8 @@
     return TRUE;
 }
 
+// GetVersionEx is deprecated; disable the warning until a replacement is found
+#pragma warning(disable : 4996)
 java_props_t *
 GetJavaProperties(JNIEnv* env)
 {
@@ -680,5 +682,5 @@
 jstring
 GetStringPlatform(JNIEnv *env, nchar* wcstr)
 {
-    return (*env)->NewString(env, wcstr, wcslen(wcstr));
+    return (*env)->NewString(env, wcstr, (jsize)wcslen(wcstr));
 }