diff options
author | Max Kellermann <max@musicpd.org> | 2018-11-19 12:49:45 +0100 |
---|---|---|
committer | Max Kellermann <max@musicpd.org> | 2018-11-19 16:33:49 +0100 |
commit | ce49d99c2f3265f2975b2cff583684bf191bbd93 (patch) | |
tree | 98fa09c94aa5d170fd3f553ac107ea2f0aa82bf4 /src/fs | |
parent | 2e450bbf959e7b72894c5037a2d46523556c8b72 (diff) |
check.h: remove obsolete header
Since we switched from autotools to Meson in commit
94592c14062d5afc9482d11baa401648082022c0, we don't need to include
`config.h` early to properly enable large file support. Meson passes
the required macros on the compiler command line instead of defining
them in `config.h`.
This means we can include `config.h` at any time, whenever we want to
check its macros, and there are no ordering constraints.
Diffstat (limited to 'src/fs')
47 files changed, 7 insertions, 52 deletions
diff --git a/src/fs/AllocatedPath.cxx b/src/fs/AllocatedPath.cxx index 8dd5894ad..32ca1f56c 100644 --- a/src/fs/AllocatedPath.cxx +++ b/src/fs/AllocatedPath.cxx @@ -17,11 +17,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" #include "AllocatedPath.hxx" #include "Domain.hxx" #include "Charset.hxx" #include "util/Compiler.h" +#include "config.h" #include <exception> diff --git a/src/fs/AllocatedPath.hxx b/src/fs/AllocatedPath.hxx index 16c386018..d8bab299c 100644 --- a/src/fs/AllocatedPath.hxx +++ b/src/fs/AllocatedPath.hxx @@ -20,7 +20,6 @@ #ifndef MPD_FS_ALLOCATED_PATH_HXX #define MPD_FS_ALLOCATED_PATH_HXX -#include "check.h" #include "util/Compiler.h" #include "Traits.hxx" #include "Path.hxx" diff --git a/src/fs/Charset.cxx b/src/fs/Charset.cxx index 36d2872ed..cf3d134ba 100644 --- a/src/fs/Charset.cxx +++ b/src/fs/Charset.cxx @@ -17,12 +17,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" #include "Charset.hxx" #include "Domain.hxx" #include "Log.hxx" #include "lib/icu/Converter.hxx" #include "util/AllocatedString.hxx" +#include "config.h" #ifdef _WIN32 #include "lib/icu/Win32.hxx" diff --git a/src/fs/Charset.hxx b/src/fs/Charset.hxx index 46aa1a581..c9e2c4d88 100644 --- a/src/fs/Charset.hxx +++ b/src/fs/Charset.hxx @@ -20,9 +20,9 @@ #ifndef MPD_FS_CHARSET_HXX #define MPD_FS_CHARSET_HXX -#include "check.h" #include "util/Compiler.h" #include "Traits.hxx" +#include "config.h" #if (defined(HAVE_ICU) || defined(HAVE_ICONV)) && !defined(_WIN32) #define HAVE_FS_CHARSET diff --git a/src/fs/CheckFile.cxx b/src/fs/CheckFile.cxx index 50c3de292..18e95de89 100644 --- a/src/fs/CheckFile.cxx +++ b/src/fs/CheckFile.cxx @@ -17,7 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" #include "CheckFile.hxx" #include "Log.hxx" #include "config/Domain.hxx" diff --git a/src/fs/CheckFile.hxx b/src/fs/CheckFile.hxx index 41a827a5d..8619ef81c 100644 --- a/src/fs/CheckFile.hxx +++ b/src/fs/CheckFile.hxx @@ -20,8 +20,6 @@ #ifndef MPD_FS_CHECK_FILE_HXX #define MPD_FS_CHECK_FILE_HXX -#include "check.h" - class Path; /** diff --git a/src/fs/Config.cxx b/src/fs/Config.cxx index be7d2e665..2ff6e7af9 100644 --- a/src/fs/Config.cxx +++ b/src/fs/Config.cxx @@ -17,10 +17,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" #include "Config.hxx" #include "Charset.hxx" #include "config/Data.hxx" +#include "config.h" void ConfigureFS(const ConfigData &config) diff --git a/src/fs/Config.hxx b/src/fs/Config.hxx index 85c54f03a..3b4887545 100644 --- a/src/fs/Config.hxx +++ b/src/fs/Config.hxx @@ -20,8 +20,6 @@ #ifndef MPD_FS_CONFIG_HXX #define MPD_FS_CONFIG_HXX -#include "check.h" - struct ConfigData; /** diff --git a/src/fs/DirectoryReader.cxx b/src/fs/DirectoryReader.cxx index 6e8bddfdf..9d77d9d23 100644 --- a/src/fs/DirectoryReader.cxx +++ b/src/fs/DirectoryReader.cxx @@ -17,7 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" #include "DirectoryReader.hxx" #include "system/Error.hxx" diff --git a/src/fs/DirectoryReader.hxx b/src/fs/DirectoryReader.hxx index 920377bd7..6d5f8c7e1 100644 --- a/src/fs/DirectoryReader.hxx +++ b/src/fs/DirectoryReader.hxx @@ -20,7 +20,6 @@ #ifndef MPD_FS_DIRECTORY_READER_HXX #define MPD_FS_DIRECTORY_READER_HXX -#include "check.h" #include "Path.hxx" #ifdef _WIN32 diff --git a/src/fs/Domain.cxx b/src/fs/Domain.cxx index 0b96573ba..706bac827 100644 --- a/src/fs/Domain.cxx +++ b/src/fs/Domain.cxx @@ -17,7 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" #include "Domain.hxx" #include "util/Domain.hxx" diff --git a/src/fs/FileInfo.hxx b/src/fs/FileInfo.hxx index d93d80972..26d9c0009 100644 --- a/src/fs/FileInfo.hxx +++ b/src/fs/FileInfo.hxx @@ -20,7 +20,6 @@ #ifndef MPD_FS_FILE_INFO_HXX #define MPD_FS_FILE_INFO_HXX -#include "check.h" #include "Path.hxx" #include "system/Error.hxx" diff --git a/src/fs/FileSystem.cxx b/src/fs/FileSystem.cxx index dfa9db938..e172befe8 100644 --- a/src/fs/FileSystem.cxx +++ b/src/fs/FileSystem.cxx @@ -17,7 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" #include "FileSystem.hxx" #include "AllocatedPath.hxx" #include "Limits.hxx" diff --git a/src/fs/FileSystem.hxx b/src/fs/FileSystem.hxx index f64aacfe7..c8bf6cc05 100644 --- a/src/fs/FileSystem.hxx +++ b/src/fs/FileSystem.hxx @@ -20,7 +20,6 @@ #ifndef MPD_FS_FILESYSTEM_HXX #define MPD_FS_FILESYSTEM_HXX -#include "check.h" #include "Traits.hxx" #include "Path.hxx" #include "system/UniqueFileDescriptor.hxx" diff --git a/src/fs/Glob.hxx b/src/fs/Glob.hxx index b31b8aaa9..31ea25769 100644 --- a/src/fs/Glob.hxx +++ b/src/fs/Glob.hxx @@ -20,7 +20,7 @@ #ifndef MPD_FS_GLOB_XX #define MPD_FS_GLOB_XX -#include "check.h" +#include "config.h" #ifdef HAVE_FNMATCH #define HAVE_CLASS_GLOB diff --git a/src/fs/Limits.hxx b/src/fs/Limits.hxx index 7e6259934..801ab5289 100644 --- a/src/fs/Limits.hxx +++ b/src/fs/Limits.hxx @@ -20,8 +20,6 @@ #ifndef MPD_FS_LIMITS_HXX #define MPD_FS_LIMITS_HXX -#include "check.h" - #include <stddef.h> #include <limits.h> diff --git a/src/fs/List.cxx b/src/fs/List.cxx index 92b23e3a3..8d0d3a2d0 100644 --- a/src/fs/List.cxx +++ b/src/fs/List.cxx @@ -17,7 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" #include "List.hxx" #include "AllocatedPath.hxx" #include "Glob.hxx" diff --git a/src/fs/List.hxx b/src/fs/List.hxx index 358f2b03b..06c925885 100644 --- a/src/fs/List.hxx +++ b/src/fs/List.hxx @@ -20,8 +20,6 @@ #ifndef MPD_FS_LIST_XX #define MPD_FS_LIST_XX -#include "check.h" - #include <forward_list> class Path; diff --git a/src/fs/NarrowPath.hxx b/src/fs/NarrowPath.hxx index db07c4a5a..20d05b7cb 100644 --- a/src/fs/NarrowPath.hxx +++ b/src/fs/NarrowPath.hxx @@ -20,7 +20,6 @@ #ifndef MPD_FS_NARROW_PATH_HXX #define MPD_FS_NARROW_PATH_HXX -#include "check.h" #include "Path.hxx" #include "util/Macros.hxx" diff --git a/src/fs/Path.cxx b/src/fs/Path.cxx index 3b62a30f2..1519e87ac 100644 --- a/src/fs/Path.cxx +++ b/src/fs/Path.cxx @@ -17,7 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" #include "Path.hxx" #include "Charset.hxx" diff --git a/src/fs/Path.hxx b/src/fs/Path.hxx index 8561f4591..45e7b40ae 100644 --- a/src/fs/Path.hxx +++ b/src/fs/Path.hxx @@ -20,7 +20,6 @@ #ifndef MPD_FS_PATH_HXX #define MPD_FS_PATH_HXX -#include "check.h" #include "util/Compiler.h" #include "Traits.hxx" diff --git a/src/fs/Path2.cxx b/src/fs/Path2.cxx index f5f0662cf..cb457a176 100644 --- a/src/fs/Path2.cxx +++ b/src/fs/Path2.cxx @@ -17,7 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" #include "Path.hxx" #include "AllocatedPath.hxx" diff --git a/src/fs/StandardDirectory.cxx b/src/fs/StandardDirectory.cxx index b2bfef8eb..f3ab31521 100644 --- a/src/fs/StandardDirectory.cxx +++ b/src/fs/StandardDirectory.cxx @@ -17,10 +17,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" #include "StandardDirectory.hxx" #include "FileSystem.hxx" #include "XDG.hxx" +#include "config.h" #include <array> diff --git a/src/fs/StandardDirectory.hxx b/src/fs/StandardDirectory.hxx index 801af4f10..ac6f4e04a 100644 --- a/src/fs/StandardDirectory.hxx +++ b/src/fs/StandardDirectory.hxx @@ -20,7 +20,6 @@ #ifndef MPD_FS_STANDARD_DIRECTORY_HXX #define MPD_FS_STANDARD_DIRECTORY_HXX -#include "check.h" #include "AllocatedPath.hxx" /** diff --git a/src/fs/Traits.cxx b/src/fs/Traits.cxx index a31393d44..c1aa4f415 100644 --- a/src/fs/Traits.cxx +++ b/src/fs/Traits.cxx @@ -17,7 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" #include "Traits.hxx" #include "util/StringCompare.hxx" diff --git a/src/fs/Traits.hxx b/src/fs/Traits.hxx index 54c2e0cce..6a7e31f0c 100644 --- a/src/fs/Traits.hxx +++ b/src/fs/Traits.hxx @@ -20,7 +20,6 @@ #ifndef MPD_FS_TRAITS_HXX #define MPD_FS_TRAITS_HXX -#include "check.h" #include "util/Compiler.h" #include "util/StringPointer.hxx" #include "util/StringAPI.hxx" diff --git a/src/fs/io/AutoGunzipReader.cxx b/src/fs/io/AutoGunzipReader.cxx index 8e95b1dfe..1762565f0 100644 --- a/src/fs/io/AutoGunzipReader.cxx +++ b/src/fs/io/AutoGunzipReader.cxx @@ -17,7 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" #include "AutoGunzipReader.hxx" #include "GunzipReader.hxx" diff --git a/src/fs/io/AutoGunzipReader.hxx b/src/fs/io/AutoGunzipReader.hxx index 232d31a7b..28e67db15 100644 --- a/src/fs/io/AutoGunzipReader.hxx +++ b/src/fs/io/AutoGunzipReader.hxx @@ -20,7 +20,6 @@ #ifndef MPD_AUTO_GUNZIP_READER_HXX #define MPD_AUTO_GUNZIP_READER_HXX -#include "check.h" #include "PeekReader.hxx" #include "util/Compiler.h" diff --git a/src/fs/io/BufferedOutputStream.cxx b/src/fs/io/BufferedOutputStream.cxx index b1598f131..46249de0a 100644 --- a/src/fs/io/BufferedOutputStream.cxx +++ b/src/fs/io/BufferedOutputStream.cxx @@ -27,7 +27,6 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "BufferedOutputStream.hxx" #include "OutputStream.hxx" diff --git a/src/fs/io/BufferedOutputStream.hxx b/src/fs/io/BufferedOutputStream.hxx index 0a8fae864..1df1c5dac 100644 --- a/src/fs/io/BufferedOutputStream.hxx +++ b/src/fs/io/BufferedOutputStream.hxx @@ -30,7 +30,6 @@ #ifndef BUFFERED_OUTPUT_STREAM_HXX #define BUFFERED_OUTPUT_STREAM_HXX -#include "check.h" #include "util/Compiler.h" #include "util/DynamicFifoBuffer.hxx" diff --git a/src/fs/io/BufferedReader.cxx b/src/fs/io/BufferedReader.cxx index 3624f6b9e..d2b5ed711 100644 --- a/src/fs/io/BufferedReader.cxx +++ b/src/fs/io/BufferedReader.cxx @@ -17,7 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" #include "BufferedReader.hxx" #include "Reader.hxx" #include "util/TextFile.hxx" diff --git a/src/fs/io/BufferedReader.hxx b/src/fs/io/BufferedReader.hxx index 9f8ae268c..0835c3d35 100644 --- a/src/fs/io/BufferedReader.hxx +++ b/src/fs/io/BufferedReader.hxx @@ -20,7 +20,6 @@ #ifndef MPD_BUFFERED_READER_HXX #define MPD_BUFFERED_READER_HXX -#include "check.h" #include "util/Compiler.h" #include "util/DynamicFifoBuffer.hxx" diff --git a/src/fs/io/FileOutputStream.cxx b/src/fs/io/FileOutputStream.cxx index c1cb69840..082ca2fe8 100644 --- a/src/fs/io/FileOutputStream.cxx +++ b/src/fs/io/FileOutputStream.cxx @@ -27,7 +27,6 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "FileOutputStream.hxx" #include "system/Error.hxx" #include "util/StringFormat.hxx" diff --git a/src/fs/io/FileOutputStream.hxx b/src/fs/io/FileOutputStream.hxx index 3f30b3c39..1f6a34ccf 100644 --- a/src/fs/io/FileOutputStream.hxx +++ b/src/fs/io/FileOutputStream.hxx @@ -30,7 +30,6 @@ #ifndef FILE_OUTPUT_STREAM_HXX #define FILE_OUTPUT_STREAM_HXX -#include "check.h" #include "OutputStream.hxx" #include "fs/AllocatedPath.hxx" #include "util/Compiler.h" diff --git a/src/fs/io/FileReader.cxx b/src/fs/io/FileReader.cxx index a97cea809..9bc167f0a 100644 --- a/src/fs/io/FileReader.cxx +++ b/src/fs/io/FileReader.cxx @@ -17,7 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" #include "FileReader.hxx" #include "fs/FileInfo.hxx" #include "system/Error.hxx" diff --git a/src/fs/io/FileReader.hxx b/src/fs/io/FileReader.hxx index 24821fb65..f5fa4ec69 100644 --- a/src/fs/io/FileReader.hxx +++ b/src/fs/io/FileReader.hxx @@ -20,7 +20,6 @@ #ifndef MPD_FILE_READER_HXX #define MPD_FILE_READER_HXX -#include "check.h" #include "Reader.hxx" #include "fs/AllocatedPath.hxx" #include "util/Compiler.h" diff --git a/src/fs/io/GunzipReader.cxx b/src/fs/io/GunzipReader.cxx index 54baa53d7..defa076ce 100644 --- a/src/fs/io/GunzipReader.cxx +++ b/src/fs/io/GunzipReader.cxx @@ -17,7 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" #include "GunzipReader.hxx" #include "lib/zlib/Error.hxx" diff --git a/src/fs/io/GunzipReader.hxx b/src/fs/io/GunzipReader.hxx index ed71ada94..817698f14 100644 --- a/src/fs/io/GunzipReader.hxx +++ b/src/fs/io/GunzipReader.hxx @@ -20,7 +20,6 @@ #ifndef MPD_GUNZIP_READER_HXX #define MPD_GUNZIP_READER_HXX -#include "check.h" #include "Reader.hxx" #include "util/StaticFifoBuffer.hxx" #include "util/Compiler.h" diff --git a/src/fs/io/GzipOutputStream.cxx b/src/fs/io/GzipOutputStream.cxx index 6e3b8802b..67f97a278 100644 --- a/src/fs/io/GzipOutputStream.cxx +++ b/src/fs/io/GzipOutputStream.cxx @@ -27,7 +27,6 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "GzipOutputStream.hxx" #include "lib/zlib/Error.hxx" diff --git a/src/fs/io/GzipOutputStream.hxx b/src/fs/io/GzipOutputStream.hxx index 99c18fe46..bfbeebdbd 100644 --- a/src/fs/io/GzipOutputStream.hxx +++ b/src/fs/io/GzipOutputStream.hxx @@ -30,7 +30,6 @@ #ifndef GZIP_OUTPUT_STREAM_HXX #define GZIP_OUTPUT_STREAM_HXX -#include "check.h" #include "OutputStream.hxx" #include "util/Compiler.h" diff --git a/src/fs/io/OutputStream.hxx b/src/fs/io/OutputStream.hxx index 625f1ebd2..7e5220ec3 100644 --- a/src/fs/io/OutputStream.hxx +++ b/src/fs/io/OutputStream.hxx @@ -30,8 +30,6 @@ #ifndef MPD_OUTPUT_STREAM_HXX #define MPD_OUTPUT_STREAM_HXX -#include "check.h" - #include <stddef.h> class OutputStream { diff --git a/src/fs/io/PeekReader.cxx b/src/fs/io/PeekReader.cxx index 8d23899ec..cd4217326 100644 --- a/src/fs/io/PeekReader.cxx +++ b/src/fs/io/PeekReader.cxx @@ -17,7 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" #include "PeekReader.hxx" #include <algorithm> diff --git a/src/fs/io/PeekReader.hxx b/src/fs/io/PeekReader.hxx index 30bf7cfeb..49c2e6514 100644 --- a/src/fs/io/PeekReader.hxx +++ b/src/fs/io/PeekReader.hxx @@ -20,7 +20,6 @@ #ifndef MPD_PEEK_READER_HXX #define MPD_PEEK_READER_HXX -#include "check.h" #include "Reader.hxx" #include "util/Compiler.h" diff --git a/src/fs/io/Reader.hxx b/src/fs/io/Reader.hxx index 9a12ac23b..9a23dec3f 100644 --- a/src/fs/io/Reader.hxx +++ b/src/fs/io/Reader.hxx @@ -20,7 +20,6 @@ #ifndef MPD_READER_HXX #define MPD_READER_HXX -#include "check.h" #include "util/Compiler.h" #include <stddef.h> diff --git a/src/fs/io/StdioOutputStream.hxx b/src/fs/io/StdioOutputStream.hxx index 2369d6208..af6dd5f51 100644 --- a/src/fs/io/StdioOutputStream.hxx +++ b/src/fs/io/StdioOutputStream.hxx @@ -30,7 +30,6 @@ #ifndef STDIO_OUTPUT_STREAM_HXX #define STDIO_OUTPUT_STREAM_HXX -#include "check.h" #include "OutputStream.hxx" #include "util/Compiler.h" diff --git a/src/fs/io/TextFile.cxx b/src/fs/io/TextFile.cxx index 5c87fe58a..55d448a8a 100644 --- a/src/fs/io/TextFile.cxx +++ b/src/fs/io/TextFile.cxx @@ -17,7 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" #include "TextFile.hxx" #include "FileReader.hxx" #include "AutoGunzipReader.hxx" diff --git a/src/fs/io/TextFile.hxx b/src/fs/io/TextFile.hxx index 172678de5..5b37afa24 100644 --- a/src/fs/io/TextFile.hxx +++ b/src/fs/io/TextFile.hxx @@ -20,8 +20,8 @@ #ifndef MPD_TEXT_FILE_HXX #define MPD_TEXT_FILE_HXX -#include "check.h" #include "util/Compiler.h" +#include "config.h" class Path; class FileReader; |