comparison src/share/vm/runtime/os.cpp @ 14360:e8ef156f0bc9

Merge
author ehelin
date Thu, 13 Feb 2014 17:57:27 +0100
parents ad3f8397fe37 e5d78f318aec
children 8a9bb7821e28
comparison
equal deleted inserted replaced
14342:78fde43dc07d 14360:e8ef156f0bc9
1195 const char* home, 1195 const char* home,
1196 int home_len, 1196 int home_len,
1197 char fileSep, 1197 char fileSep,
1198 char pathSep) { 1198 char pathSep) {
1199 assert((fileSep == '/' && pathSep == ':') || 1199 assert((fileSep == '/' && pathSep == ':') ||
1200 (fileSep == '\\' && pathSep == ';'), "unexpected seperator chars"); 1200 (fileSep == '\\' && pathSep == ';'), "unexpected separator chars");
1201 1201
1202 // Scan the format string to determine the length of the actual 1202 // Scan the format string to determine the length of the actual
1203 // boot classpath, and handle platform dependencies as well. 1203 // boot classpath, and handle platform dependencies as well.
1204 int formatted_path_len = 0; 1204 int formatted_path_len = 0;
1205 const char* p; 1205 const char* p;