--- a/jdk/src/java.base/windows/native/libjli/java_md.c Thu Apr 02 14:25:27 2015 -0400
+++ b/jdk/src/java.base/windows/native/libjli/java_md.c Thu Apr 02 11:54:33 2015 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -107,7 +107,7 @@
* GetParamValue("theParam", "theParam=value") returns pointer to "value".
*/
const char * GetParamValue(const char *paramName, const char *arg) {
- int nameLen = JLI_StrLen(paramName);
+ size_t nameLen = JLI_StrLen(paramName);
if (JLI_StrNCmp(paramName, arg, nameLen) == 0) {
/* arg[nameLen] is valid (may contain final NULL) */
if (arg[nameLen] == '=') {
@@ -561,7 +561,7 @@
if (rc < 0) {
/* apply ansi semantics */
buffer[size - 1] = '\0';
- return size;
+ return (int)size;
} else if (rc == size) {
/* force a null terminator */
buffer[size - 1] = '\0';
@@ -728,11 +728,6 @@
}
}
-const char *
-jlong_format_specifier() {
- return "%I64d";
-}
-
/*
* Block current thread and continue execution in a new thread
*/
@@ -882,7 +877,7 @@
if (hPreloadAwt == NULL) {
/* awt.dll is not loaded yet */
char libraryPath[MAXPATHLEN];
- int jrePathLen = 0;
+ size_t jrePathLen = 0;
HMODULE hJava = NULL;
HMODULE hVerify = NULL;
@@ -1004,7 +999,8 @@
jobjectArray
CreateApplicationArgs(JNIEnv *env, char **strv, int argc)
{
- int i, j, idx, tlen;
+ int i, j, idx;
+ size_t tlen;
jobjectArray outArray, inArray;
char *ostart, *astart, **nargv;
jboolean needs_expansion = JNI_FALSE;