diff options
Diffstat (limited to 'src/fs/Config.cxx')
| -rw-r--r-- | src/fs/Config.cxx | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/fs/Config.cxx b/src/fs/Config.cxx index 63e64ef99..6aa23005c 100644 --- a/src/fs/Config.cxx +++ b/src/fs/Config.cxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2013 The Music Player Daemon Project + * Copyright (C) 2003-2014 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -20,24 +20,19 @@ #include "config.h" #include "Config.hxx" #include "Charset.hxx" -#include "Domain.hxx" -#include "ConfigGlobal.hxx" -#include "Log.hxx" -#include "Compiler.h" - -#include <glib.h> - -#include <assert.h> -#include <string.h> +#include "config/ConfigGlobal.hxx" #ifdef WIN32 #include <windows.h> // for GetACP() #include <stdio.h> // for sprintf() +#elif defined(HAVE_GLIB) +#include <glib.h> #endif void ConfigureFS() { +#if defined(HAVE_GLIB) || defined(WIN32) const char *charset = nullptr; charset = config_get_string(CONF_FS_CHARSET, nullptr); @@ -62,4 +57,5 @@ ConfigureFS() if (charset != nullptr) SetFSCharset(charset); +#endif } |