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

fs/Charset: move HAVE_FS_CHARSET to Features.hxx

This commit is contained in:
Max Kellermann 2019-04-24 14:24:54 +02:00
parent a8ee7269bc
commit 162845cc6d
5 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/fs/AllocatedPath.cxx
View File

@ -20,6 +20,7 @@
#include "AllocatedPath.hxx"
#include "Domain.hxx"
#include "Charset.hxx"
#include "Features.hxx"
#include "util/Compiler.h"
#include "config.h"

3
src/fs/Charset.cxx
View File

@ -1,5 +1,5 @@
/*
* Copyright 2003-2018 The Music Player Daemon Project
* Copyright 2003-2019 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@ -18,6 +18,7 @@
*/
#include "Charset.hxx"
#include "Features.hxx"
#include "Domain.hxx"
#include "Log.hxx"
#include "lib/icu/Converter.hxx"

7
src/fs/Charset.hxx
View File

@ -1,5 +1,5 @@
/*
* Copyright 2003-2018 The Music Player Daemon Project
* Copyright 2003-2019 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@ -22,11 +22,6 @@
#include "util/Compiler.h"
#include "Traits.hxx"
#include "config.h"
#if (defined(HAVE_ICU) || defined(HAVE_ICONV)) && !defined(_WIN32)
#define HAVE_FS_CHARSET
#endif
/**
* Gets file system character set name.

3
src/fs/Config.cxx
View File

@ -1,5 +1,5 @@
/*
* Copyright 2003-2018 The Music Player Daemon Project
* Copyright 2003-2019 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@ -19,6 +19,7 @@
#include "Config.hxx"
#include "Charset.hxx"
#include "Features.hxx"
#include "config/Data.hxx"
#include "config.h"

29
src/fs/Features.hxx Normal file
View File

@ -0,0 +1,29 @@
/*
* Copyright 2003-2019 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_FS_FEATURES_HXX
#define MPD_FS_FEATURES_HXX
#include "config.h"
#if (defined(HAVE_ICU) || defined(HAVE_ICONV)) && !defined(_WIN32)
#define HAVE_FS_CHARSET
#endif
#endif