diff --git a/src/java.instrument/share/native/libinstrument/FileSystemSupport.h b/src/java.instrument/share/native/libinstrument/FileSystemSupport.h index a66bbf97142..b5408b40112 100644 --- a/src/java.instrument/share/native/libinstrument/FileSystemSupport.h +++ b/src/java.instrument/share/native/libinstrument/FileSystemSupport.h @@ -43,7 +43,7 @@ char* basePath(const char* path); * Convert the given pathname string to normal form. If the string is * already in normal form then it is simply returned. */ -char* normalize(const char* path); +char* normalize_path(const char* path); /** * Tell whether or not the given abstract pathname is absolute. diff --git a/src/java.instrument/share/native/libinstrument/InvocationAdapter.c b/src/java.instrument/share/native/libinstrument/InvocationAdapter.c index 41ab02f6e6e..0a121456766 100644 --- a/src/java.instrument/share/native/libinstrument/InvocationAdapter.c +++ b/src/java.instrument/share/native/libinstrument/InvocationAdapter.c @@ -924,7 +924,7 @@ appendBootClassPath( JPLISAgent* agent, * Normalize the path - no duplicate slashes (except UNCs on Windows), trailing * slash removed. */ - TRANSFORM(path, normalize(path)); + TRANSFORM(path, normalize_path(path)); /* * If the path is an absolute path then add to the bootclassloader diff --git a/src/java.instrument/unix/native/libinstrument/FileSystemSupport_md.c b/src/java.instrument/unix/native/libinstrument/FileSystemSupport_md.c index a58c1579f0c..f7ea013412d 100644 --- a/src/java.instrument/unix/native/libinstrument/FileSystemSupport_md.c +++ b/src/java.instrument/unix/native/libinstrument/FileSystemSupport_md.c @@ -100,7 +100,7 @@ static char* normalizePath(const char* pathname, int len, int off) { /* Check that the given pathname is normal. If not, invoke the real normalizer on the part of the pathname that requires normalization. This way we iterate through the whole pathname string only once. */ -char* normalize(const char* pathname) { +char* normalize_path(const char* pathname) { int i; int n = strlen(pathname); char prevChar = 0; diff --git a/src/java.instrument/windows/native/libinstrument/FileSystemSupport_md.c b/src/java.instrument/windows/native/libinstrument/FileSystemSupport_md.c index 35104f8e267..06c2e6d6e33 100644 --- a/src/java.instrument/windows/native/libinstrument/FileSystemSupport_md.c +++ b/src/java.instrument/windows/native/libinstrument/FileSystemSupport_md.c @@ -196,7 +196,7 @@ static char* normalizePath(const char* path, int len, int off) { * normalizer on the part of the pathname that requires normalization. * This way we iterate through the whole pathname string only once. */ -char* normalize(char* path) { +char* normalize_path(char* path) { int n = (int)strlen(path); int i; int prev = 0;