oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

fs/Config: swap #if/#else

Browse Source
This commit is contained in:
Max Kellermann 2014-11-30 20:34:32 +01:00
parent 0f35016773
commit 41efc1376e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/fs/Config.cxx
View File

@ -37,13 +37,7 @@ ConfigureFS(Error &error)
charset = config_get_string(CONF_FS_CHARSET, nullptr); charset = config_get_string(CONF_FS_CHARSET, nullptr);
if (charset == nullptr) { if (charset == nullptr) {
#ifndef WIN32 #ifdef WIN32
const gchar **encodings;
g_get_filename_charsets(&encodings);
if (encodings[0] != nullptr && *encodings[0] != '\0')
charset = encodings[0];
#else
/* Glib claims that file system encoding is always utf-8 /* Glib claims that file system encoding is always utf-8
* on native Win32 (i.e. not Cygwin). * on native Win32 (i.e. not Cygwin).
* However this is true only if <gstdio.h> helpers are used. * However this is true only if <gstdio.h> helpers are used.
@ -52,6 +46,12 @@ ConfigureFS(Error &error)
static char win_charset[13]; static char win_charset[13];
sprintf(win_charset, "cp%u", GetACP()); sprintf(win_charset, "cp%u", GetACP());
charset = win_charset; charset = win_charset;
#else
const gchar **encodings;
g_get_filename_charsets(&encodings);
if (encodings[0] != nullptr && *encodings[0] != '\0')
charset = encodings[0];
#endif #endif
} }