phosit/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

GCC build fixes

Browse Source 
This was SVN commit r7186.
This commit is contained in:
Ykkrosh 2009-11-09 17:36:39 +00:00
parent 450da0aaf7
commit 593bf6a571
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/lib/sysdep/os/linux/dir_watch_fam.cpp
View File

@ -153,7 +153,7 @@ LibError dir_watch_Poll(DirWatchNotifications& notifications)
continue;
}
DirWatch* dirWatch = (DirWatch*)e.userdata;
fs::wpath pathname = dirWatch->path/wstring_from_string(e.filename);
fs::wpath pathname = dirWatch->path/wstring_from_UTF8(e.filename);
notifications.push_back(DirWatchNotification(pathname, type));
}
}

10
source/lib/sysdep/os/linux/ldbg.cpp
View File

@ -215,7 +215,7 @@ void udbg_bfd_init(void)
std::string exename;
if (sys_get_executable_name(path) == INFO::OK)
{
exename = string_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_string(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_string(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_string(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_string(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");

4
source/lib/sysdep/os/linux/linux.cpp
View File

@ -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_string(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_string(resolved);
pathname = wstring_from_UTF8(resolved);
return INFO::OK;
}

2
source/lib/sysdep/os/unix/unix.cpp
View File

@ -183,7 +183,7 @@ int sys_wopen(const wchar_t* pathname, int oflag, ...)
va_end(args);
}
return open(string_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