GCC build fixes
This was SVN commit r7188.
This commit is contained in:
parent
ff15c522fe
commit
6ee9dd8afe
@ -153,7 +153,7 @@ LibError dir_watch_Poll(DirWatchNotifications& notifications)
|
||||
continue;
|
||||
}
|
||||
DirWatch* dirWatch = (DirWatch*)e.userdata;
|
||||
fs::wpath pathname = dirWatch->path/wstring_from_UTF8(e.filename);
|
||||
fs::wpath pathname = dirWatch->path/wstring_from_utf8(e.filename);
|
||||
notifications.push_back(DirWatchNotification(pathname, type));
|
||||
}
|
||||
}
|
||||
|
@ -215,7 +215,7 @@ void udbg_bfd_init(void)
|
||||
std::string exename;
|
||||
if (sys_get_executable_name(path) == INFO::OK)
|
||||
{
|
||||
exename = UTF8_from_wstring(path.string());
|
||||
exename = utf8_from_wstring(path.string());
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -307,7 +307,7 @@ static LibError debug_resolve_symbol_dladdr(void *ptr, wchar_t* sym_name, wchar_
|
||||
{
|
||||
char sym_name_buf[DBG_SYMBOL_LEN];
|
||||
demangle_buf(sym_name_buf, syminfo.dli_sname, DBG_SYMBOL_LEN);
|
||||
wcscpy_s(sym_name, DBG_SYMBOL_LEN, wstring_from_UTF8(sym_name_buf).c_str());
|
||||
wcscpy_s(sym_name, DBG_SYMBOL_LEN, wstring_from_utf8(sym_name_buf).c_str());
|
||||
}
|
||||
else
|
||||
swprintf_s(sym_name, DBG_SYMBOL_LEN, L"%p", ptr);
|
||||
@ -315,7 +315,7 @@ static LibError debug_resolve_symbol_dladdr(void *ptr, wchar_t* sym_name, wchar_
|
||||
|
||||
if (file)
|
||||
{
|
||||
wcscpy_s(file, DBG_FILE_LEN, wstring_from_UTF8(syminfo.dli_fname).c_str());
|
||||
wcscpy_s(file, DBG_FILE_LEN, wstring_from_utf8(syminfo.dli_fname).c_str());
|
||||
}
|
||||
|
||||
if (line)
|
||||
@ -365,7 +365,7 @@ LibError debug_ResolveSymbol(void* ptr_of_interest, wchar_t* sym_name, wchar_t*
|
||||
{
|
||||
char sym_name_buf[DBG_SYMBOL_LEN];
|
||||
demangle_buf(sym_name_buf, ctx.symbol, DBG_SYMBOL_LEN);
|
||||
wcscpy_s(sym_name, DBG_SYMBOL_LEN, wstring_from_UTF8(sym_name_buf).c_str());
|
||||
wcscpy_s(sym_name, DBG_SYMBOL_LEN, wstring_from_utf8(sym_name_buf).c_str());
|
||||
}
|
||||
|
||||
if (file)
|
||||
@ -377,7 +377,7 @@ LibError debug_ResolveSymbol(void* ptr_of_interest, wchar_t* sym_name, wchar_t*
|
||||
if (h != NULL)
|
||||
ctx.filename = h + 1;
|
||||
|
||||
wcscpy_s(file, DBG_FILE_LEN, wstring_from_UTF8(ctx.filename).c_str());
|
||||
wcscpy_s(file, DBG_FILE_LEN, wstring_from_utf8(ctx.filename).c_str());
|
||||
}
|
||||
else
|
||||
wcscpy_s(file, DBG_FILE_LEN, L"none");
|
||||
|
@ -47,7 +47,7 @@ LibError sys_get_executable_name(fs::wpath& pathname)
|
||||
char* resolved = realpath(path, resolvedBuf);
|
||||
if (!resolved)
|
||||
return ERR::FAIL;
|
||||
pathname = wstring_from_UTF8(resolved);
|
||||
pathname = wstring_from_utf8(resolved);
|
||||
return INFO::OK;
|
||||
}
|
||||
|
||||
@ -66,7 +66,7 @@ LibError sys_get_executable_name(fs::wpath& pathname)
|
||||
char* resolved = realpath(absolute, resolvedBuf);
|
||||
if (!resolved)
|
||||
return ERR::NO_SYS;
|
||||
pathname = wstring_from_UTF8(resolved);
|
||||
pathname = wstring_from_utf8(resolved);
|
||||
return INFO::OK;
|
||||
}
|
||||
|
||||
|
@ -183,7 +183,7 @@ int sys_wopen(const wchar_t* pathname, int oflag, ...)
|
||||
va_end(args);
|
||||
}
|
||||
|
||||
return open(UTF8_from_wstring(pathname).c_str(), oflag, mode);
|
||||
return open(utf8_from_wstring(pathname).c_str(), oflag, mode);
|
||||
}
|
||||
|
||||
// note: just use the sector size: Linux aio doesn't really care about
|
||||
|
Loading…
Reference in New Issue
Block a user