Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix compilation with mingw32

Browse Source
This commit is contained in:
Andrzej Rybczak
2010-05-14 18:05:14 +02:00
parent 6eae6cd0f6
commit 9adb762036
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/helpers.cpp
View File

@@ -268,8 +268,12 @@ bool CaseInsensitiveSorting::operator()(const MPD::Item &a, const MPD::Item &b)
std::string Timestamp(time_t t) std::string Timestamp(time_t t)
{ {
char result[32]; char result[32];
# ifdef WIN32
result[strftime(result, 31, "%x %X", localtime(&t))] = 0;
# else
tm info; tm info;
result[strftime(result, 31, "%x %X", localtime_r(&t, &info))] = 0; result[strftime(result, 31, "%x %X", localtime_r(&t, &info))] = 0;
# endif // WIN32
return result; return result;
} }

4
src/window.cpp
View File

@@ -940,7 +940,11 @@ std::wstring ToWString(const std::string &s)
size_t Window::Length(const std::wstring &ws) size_t Window::Length(const std::wstring &ws)
{ {
# ifdef WIN32
return ws.length();
# else
int len = wcswidth(ws.c_str(), -1); int len = wcswidth(ws.c_str(), -1);
return len < 0 ? ws.length() : len; return len < 0 ? ws.length() : len;
# endif // WIN32
} }