From ec54754e22602bbc18a7524b6ff07db2a4b6d095 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 20 Aug 2018 16:19:17 +0200 Subject: Compiler.h: move to util/ --- src/AudioFormat.hxx | 2 +- src/Compiler.h | 186 ------------------------- src/IdleFlags.hxx | 2 +- src/Instance.hxx | 2 +- src/LocateUri.hxx | 2 +- src/Log.hxx | 2 +- src/Mapper.hxx | 2 +- src/MixRampInfo.hxx | 2 +- src/MusicPipe.hxx | 2 +- src/Partition.hxx | 2 +- src/ReplayGainInfo.hxx | 2 +- src/ReplayGainMode.hxx | 2 +- src/SingleMode.hxx | 2 +- src/SongLoader.hxx | 2 +- src/StateFile.hxx | 2 +- src/android/Environment.hxx | 2 +- src/client/Client.hxx | 2 +- src/client/ClientMessage.hxx | 2 +- src/client/Response.hxx | 2 +- src/command/NeighborCommands.hxx | 2 +- src/command/PlaylistCommands.hxx | 2 +- src/config/Block.hxx | 2 +- src/config/Check.hxx | 2 +- src/config/Option.hxx | 2 +- src/config/Param.hxx | 2 +- src/db/Count.hxx | 2 +- src/db/DatabaseGlue.hxx | 2 +- src/db/DatabaseLock.hxx | 2 +- src/db/DatabasePlaylist.hxx | 2 +- src/db/DatabaseSong.hxx | 2 +- src/db/Interface.hxx | 2 +- src/db/LightDirectory.hxx | 2 +- src/db/PlaylistInfo.hxx | 2 +- src/db/PlaylistVector.hxx | 2 +- src/db/Registry.hxx | 2 +- src/db/Selection.hxx | 2 +- src/db/plugins/ProxyDatabasePlugin.cxx | 2 +- src/db/plugins/simple/Directory.hxx | 2 +- src/db/plugins/simple/SimpleDatabasePlugin.hxx | 2 +- src/db/plugins/simple/Song.hxx | 2 +- src/db/plugins/upnp/Directory.hxx | 2 +- src/db/plugins/upnp/Object.hxx | 2 +- src/db/update/Editor.hxx | 2 +- src/db/update/ExcludeList.hxx | 2 +- src/db/update/InotifySource.hxx | 2 +- src/db/update/InotifyUpdate.hxx | 2 +- src/db/update/Queue.hxx | 2 +- src/db/update/Remove.hxx | 2 +- src/db/update/Service.hxx | 2 +- src/db/update/UpdateIO.hxx | 2 +- src/db/update/Walk.hxx | 2 +- src/decoder/Client.hxx | 2 +- src/decoder/DecoderBuffer.hxx | 2 +- src/decoder/DecoderList.hxx | 2 +- src/decoder/DecoderPlugin.hxx | 2 +- src/decoder/Reader.hxx | 2 +- src/decoder/plugins/DsdLib.hxx | 2 +- src/decoder/plugins/FlacInput.cxx | 2 +- src/encoder/EncoderInterface.hxx | 2 +- src/encoder/plugins/NullEncoderPlugin.cxx | 2 +- src/event/BufferedSocket.cxx | 2 +- src/event/Call.cxx | 2 +- src/event/FullyBufferedSocket.cxx | 2 +- src/event/Loop.hxx | 2 +- src/event/MultiSocketMonitor.hxx | 2 +- src/event/PollGroupEPoll.hxx | 2 +- src/filter/FilterRegistry.hxx | 2 +- src/filter/plugins/NullFilterPlugin.cxx | 2 +- src/fs/AllocatedPath.cxx | 2 +- src/fs/AllocatedPath.hxx | 2 +- src/fs/Charset.hxx | 2 +- src/fs/Glob.hxx | 2 +- src/fs/Path.hxx | 2 +- src/fs/Traits.hxx | 2 +- src/fs/io/AutoGunzipReader.hxx | 2 +- src/fs/io/BufferedOutputStream.hxx | 2 +- src/fs/io/BufferedReader.hxx | 2 +- src/fs/io/FileOutputStream.hxx | 2 +- src/fs/io/FileReader.hxx | 2 +- src/fs/io/GunzipReader.hxx | 2 +- src/fs/io/GzipOutputStream.hxx | 2 +- src/fs/io/PeekReader.hxx | 2 +- src/fs/io/Reader.hxx | 2 +- src/fs/io/StdioOutputStream.hxx | 2 +- src/fs/io/TextFile.hxx | 2 +- src/input/Error.hxx | 2 +- src/input/IcyInputStream.hxx | 2 +- src/input/InputStream.hxx | 2 +- src/input/Reader.hxx | 2 +- src/java/Global.hxx | 2 +- src/lib/alsa/Format.hxx | 2 +- src/lib/alsa/Version.hxx | 2 +- src/lib/curl/Version.hxx | 2 +- src/lib/dbus/Error.hxx | 2 +- src/lib/dbus/UDisks2.cxx | 2 +- src/lib/dbus/Watch.hxx | 2 +- src/lib/expat/ExpatParser.hxx | 2 +- src/lib/ffmpeg/Time.hxx | 2 +- src/lib/gcrypt/Hash.hxx | 2 +- src/lib/gcrypt/MD5.hxx | 2 +- src/lib/icu/CaseFold.hxx | 2 +- src/lib/icu/Collate.hxx | 2 +- src/lib/icu/Compare.hxx | 2 +- src/lib/icu/Converter.hxx | 2 +- src/lib/icu/Win32.hxx | 2 +- src/lib/nfs/Base.hxx | 2 +- src/lib/nfs/Cancellable.hxx | 2 +- src/lib/nfs/FileReader.hxx | 2 +- src/lib/nfs/Glue.hxx | 2 +- src/lib/nfs/Manager.hxx | 2 +- src/lib/upnp/Action.hxx | 2 +- src/lib/upnp/Compat.hxx | 2 +- src/lib/upnp/ContentDirectoryService.hxx | 2 +- src/lib/upnp/Discovery.hxx | 2 +- src/lib/upnp/Util.hxx | 2 +- src/lib/xiph/FlacIOHandle.cxx | 2 +- src/lib/xiph/FlacIOHandle.hxx | 2 +- src/lib/xiph/FlacMetadataChain.hxx | 2 +- src/lib/xiph/FlacMetadataIterator.hxx | 2 +- src/lib/xiph/OggSerial.cxx | 2 +- src/ls.hxx | 2 +- src/mixer/MixerInternal.hxx | 2 +- src/mixer/MixerType.hxx | 2 +- src/mixer/Volume.hxx | 2 +- src/mixer/plugins/HaikuMixerPlugin.cxx | 2 +- src/mixer/plugins/RoarMixerPlugin.cxx | 2 +- src/neighbor/Glue.hxx | 2 +- src/neighbor/Registry.hxx | 2 +- src/net/AllocatedSocketAddress.hxx | 2 +- src/net/Resolver.hxx | 2 +- src/net/SocketAddress.hxx | 2 +- src/net/SocketError.hxx | 2 +- src/net/StaticSocketAddress.hxx | 2 +- src/net/ToString.hxx | 2 +- src/output/Control.hxx | 2 +- src/output/Interface.cxx | 2 +- src/output/MultipleOutputs.hxx | 2 +- src/output/OutputPlugin.hxx | 2 +- src/output/SharedPipeConsumer.hxx | 2 +- src/output/Source.hxx | 2 +- src/output/plugins/WinmmOutputPlugin.hxx | 2 +- src/output/plugins/httpd/HttpdClient.hxx | 2 +- src/output/plugins/httpd/HttpdInternal.hxx | 2 +- src/pcm/FallbackResampler.hxx | 2 +- src/pcm/Interleave.hxx | 2 +- src/pcm/LibsamplerateResampler.hxx | 2 +- src/pcm/PcmBuffer.hxx | 2 +- src/pcm/PcmMix.hxx | 2 +- src/pcm/PcmUtils.hxx | 2 +- src/pcm/Resampler.hxx | 2 +- src/pcm/SampleFormat.hxx | 2 +- src/pcm/SoxrResampler.hxx | 2 +- src/player/CrossFade.hxx | 2 +- src/player/Outputs.hxx | 2 +- src/playlist/MemorySongEnumerator.hxx | 2 +- src/playlist/PlaylistRegistry.hxx | 2 +- src/playlist/PlaylistStream.hxx | 2 +- src/playlist/cue/CueParser.hxx | 2 +- src/queue/IdTable.hxx | 2 +- src/queue/Queue.hxx | 2 +- src/song/AndSongFilter.hxx | 2 +- src/song/BaseSongFilter.hxx | 2 +- src/song/DetachedSong.hxx | 2 +- src/song/Filter.hxx | 2 +- src/song/ISongFilter.hxx | 2 +- src/song/LightSong.hxx | 2 +- src/song/StringFilter.hxx | 2 +- src/sticker/StickerDatabase.hxx | 2 +- src/storage/CompositeStorage.hxx | 2 +- src/storage/Configured.hxx | 2 +- src/storage/Registry.hxx | 2 +- src/storage/StorageInterface.hxx | 2 +- src/storage/plugins/LocalStorage.hxx | 2 +- src/system/ByteOrder.hxx | 2 +- src/system/Clock.hxx | 2 +- src/system/Error.hxx | 2 +- src/system/EventFD.cxx | 2 +- src/system/EventPipe.cxx | 2 +- src/system/FatalError.hxx | 2 +- src/system/FileDescriptor.hxx | 2 +- src/tag/Builder.hxx | 2 +- src/tag/FixString.hxx | 2 +- src/tag/Format.hxx | 2 +- src/tag/Handler.hxx | 2 +- src/tag/ParseName.hxx | 2 +- src/tag/Set.hxx | 2 +- src/tag/Settings.hxx | 2 +- src/tag/Table.hxx | 2 +- src/tag/Tag.hxx | 2 +- src/tag/VorbisComment.hxx | 2 +- src/thread/Id.hxx | 2 +- src/thread/Thread.hxx | 2 +- src/util/Compiler.h | 186 +++++++++++++++++++++++++ src/win32/Win32Main.cxx | 2 +- src/zeroconf/AvahiPoll.hxx | 2 +- src/zeroconf/ZeroconfBonjour.cxx | 2 +- src/zeroconf/ZeroconfGlue.cxx | 2 +- 197 files changed, 381 insertions(+), 381 deletions(-) delete mode 100644 src/Compiler.h create mode 100644 src/util/Compiler.h (limited to 'src') diff --git a/src/AudioFormat.hxx b/src/AudioFormat.hxx index d98483085..8b0ffb557 100644 --- a/src/AudioFormat.hxx +++ b/src/AudioFormat.hxx @@ -21,7 +21,7 @@ #define MPD_AUDIO_FORMAT_HXX #include "pcm/SampleFormat.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/Compiler.h b/src/Compiler.h deleted file mode 100644 index d2ca0b8f3..000000000 --- a/src/Compiler.h +++ /dev/null @@ -1,186 +0,0 @@ -/* - * Copyright 2003-2017 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 COMPILER_H -#define COMPILER_H - -#define GCC_MAKE_VERSION(major, minor, patchlevel) ((major) * 10000 + (minor) * 100 + patchlevel) - -#ifdef __GNUC__ -#define GCC_VERSION GCC_MAKE_VERSION(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) -#else -#define GCC_VERSION 0 -#endif - -#ifdef __clang__ -# define CLANG_VERSION GCC_MAKE_VERSION(__clang_major__, __clang_minor__, __clang_patchlevel__) -#elif defined(__GNUC__) -# define CLANG_VERSION 0 -#endif - -/** - * Are we building with the specified version of gcc (not clang or any - * other compiler) or newer? - */ -#define GCC_CHECK_VERSION(major, minor) \ - (CLANG_VERSION == 0 && \ - GCC_VERSION >= GCC_MAKE_VERSION(major, minor, 0)) - -/** - * Are we building with clang (any version) or at least the specified - * gcc version? - */ -#define CLANG_OR_GCC_VERSION(major, minor) \ - (CLANG_VERSION > 0 || GCC_CHECK_VERSION(major, minor)) - -/** - * Are we building with gcc (not clang or any other compiler) and a - * version older than the specified one? - */ -#define GCC_OLDER_THAN(major, minor) \ - (GCC_VERSION > 0 && CLANG_VERSION == 0 && \ - GCC_VERSION < GCC_MAKE_VERSION(major, minor, 0)) - -#ifdef __clang__ -# if __clang_major__ < 3 -# error Sorry, your clang version is too old. You need at least version 3.1. -# endif -#elif defined(__GNUC__) -# if GCC_OLDER_THAN(6,0) -# error Sorry, your gcc version is too old. You need at least version 6.0. -# endif -#else -# warning Untested compiler. Use at your own risk! -#endif - -/** - * Are we building with the specified version of clang or newer? - */ -#define CLANG_CHECK_VERSION(major, minor) \ - (CLANG_VERSION >= GCC_MAKE_VERSION(major, minor, 0)) - -#if CLANG_OR_GCC_VERSION(4,0) - -/* GCC 4.x */ - -#define gcc_const __attribute__((const)) -#define gcc_deprecated __attribute__((deprecated)) -#define gcc_may_alias __attribute__((may_alias)) -#define gcc_malloc __attribute__((malloc)) -#define gcc_noreturn __attribute__((noreturn)) -#define gcc_packed __attribute__((packed)) -#define gcc_printf(a,b) __attribute__((format(printf, a, b))) -#define gcc_pure __attribute__((pure)) -#define gcc_sentinel __attribute__((sentinel)) -#define gcc_unused __attribute__((unused)) -#define gcc_warn_unused_result __attribute__((warn_unused_result)) - -#define gcc_nonnull(...) __attribute__((nonnull(__VA_ARGS__))) -#define gcc_nonnull_all __attribute__((nonnull)) -#define gcc_returns_nonnull __attribute__((returns_nonnull)) -#define gcc_returns_twice __attribute__((returns_twice)) - -#define gcc_likely(x) __builtin_expect (!!(x), 1) -#define gcc_unlikely(x) __builtin_expect (!!(x), 0) - -#define gcc_visibility_hidden __attribute__((visibility("hidden"))) -#define gcc_visibility_default __attribute__((visibility("default"))) - -#define gcc_noinline __attribute__((noinline)) -#define gcc_always_inline __attribute__((always_inline)) - -#else - -/* generic C compiler */ - -#define gcc_const -#define gcc_deprecated -#define gcc_may_alias -#define gcc_malloc -#define gcc_noreturn -#define gcc_packed -#define gcc_printf(a,b) -#define gcc_pure -#define gcc_sentinel -#define gcc_unused -#define gcc_warn_unused_result - -#define gcc_nonnull(...) -#define gcc_nonnull_all -#define gcc_returns_nonnull -#define gcc_returns_twice - -#define gcc_likely(x) (x) -#define gcc_unlikely(x) (x) - -#define gcc_visibility_hidden -#define gcc_visibility_default - -#define gcc_noinline -#define gcc_always_inline inline - -#endif - -#if CLANG_OR_GCC_VERSION(4,3) - -#define gcc_hot __attribute__((hot)) -#define gcc_cold __attribute__((cold)) - -#else /* ! GCC_UNUSED >= 40300 */ - -#define gcc_hot -#define gcc_cold - -#endif /* ! GCC_UNUSED >= 40300 */ - -#if GCC_CHECK_VERSION(4,6) -#define gcc_flatten __attribute__((flatten)) -#else -#define gcc_flatten -#endif - -#ifndef __cplusplus -/* plain C99 has "restrict" */ -#define gcc_restrict restrict -#elif CLANG_OR_GCC_VERSION(4,0) -/* "__restrict__" is a GCC extension for C++ */ -#define gcc_restrict __restrict__ -#else -/* disable it on other compilers */ -#define gcc_restrict -#endif - -#ifndef __has_feature - // define dummy macro for non-clang compilers - #define __has_feature(x) 0 -#endif - -#if __has_feature(attribute_unused_on_fields) -#define gcc_unused_field gcc_unused -#else -#define gcc_unused_field -#endif - -#if defined(__GNUC__) || defined(__clang__) -#define gcc_unreachable() __builtin_unreachable() -#else -#define gcc_unreachable() -#endif - -#endif diff --git a/src/IdleFlags.hxx b/src/IdleFlags.hxx index ab253f092..25742737a 100644 --- a/src/IdleFlags.hxx +++ b/src/IdleFlags.hxx @@ -25,7 +25,7 @@ #ifndef MPD_IDLE_FLAGS_HXX #define MPD_IDLE_FLAGS_HXX -#include "Compiler.h" +#include "util/Compiler.h" /** song database has been updated*/ static constexpr unsigned IDLE_DATABASE = 0x1; diff --git a/src/Instance.hxx b/src/Instance.hxx index 6b1e6d87a..4b9604dcb 100644 --- a/src/Instance.hxx +++ b/src/Instance.hxx @@ -24,7 +24,7 @@ #include "event/Loop.hxx" #include "event/Thread.hxx" #include "event/MaskMonitor.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #ifdef ENABLE_SYSTEMD_DAEMON #include "lib/systemd/Watchdog.hxx" diff --git a/src/LocateUri.hxx b/src/LocateUri.hxx index 71c018061..b1f561520 100644 --- a/src/LocateUri.hxx +++ b/src/LocateUri.hxx @@ -21,7 +21,7 @@ #define MPD_LOCATE_URI_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include "fs/AllocatedPath.hxx" #ifdef _WIN32 diff --git a/src/Log.hxx b/src/Log.hxx index a57fccd65..25da072ba 100644 --- a/src/Log.hxx +++ b/src/Log.hxx @@ -21,7 +21,7 @@ #define MPD_LOG_HXX #include "LogLevel.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/Mapper.hxx b/src/Mapper.hxx index 55731a6d8..e0563c835 100644 --- a/src/Mapper.hxx +++ b/src/Mapper.hxx @@ -26,7 +26,7 @@ #include -#include "Compiler.h" +#include "util/Compiler.h" #define PLAYLIST_FILE_SUFFIX ".m3u" diff --git a/src/MixRampInfo.hxx b/src/MixRampInfo.hxx index c5caf241f..0c408ecbf 100644 --- a/src/MixRampInfo.hxx +++ b/src/MixRampInfo.hxx @@ -21,7 +21,7 @@ #define MPD_MIX_RAMP_INFO_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/MusicPipe.hxx b/src/MusicPipe.hxx index e4546ed44..e1c44377e 100644 --- a/src/MusicPipe.hxx +++ b/src/MusicPipe.hxx @@ -22,7 +22,7 @@ #include "MusicChunkPtr.hxx" #include "thread/Mutex.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #ifndef NDEBUG #include "AudioFormat.hxx" diff --git a/src/Partition.hxx b/src/Partition.hxx index e2e15351d..83a0ec69a 100644 --- a/src/Partition.hxx +++ b/src/Partition.hxx @@ -30,7 +30,7 @@ #include "ReplayGainMode.hxx" #include "SingleMode.hxx" #include "Chrono.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/ReplayGainInfo.hxx b/src/ReplayGainInfo.hxx index 4cdbbc0c6..0cf1d700a 100644 --- a/src/ReplayGainInfo.hxx +++ b/src/ReplayGainInfo.hxx @@ -21,7 +21,7 @@ #define MPD_REPLAY_GAIN_INFO_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include "ReplayGainMode.hxx" struct ReplayGainConfig; diff --git a/src/ReplayGainMode.hxx b/src/ReplayGainMode.hxx index 885151704..789d86007 100644 --- a/src/ReplayGainMode.hxx +++ b/src/ReplayGainMode.hxx @@ -20,7 +20,7 @@ #ifndef MPD_REPLAY_GAIN_MODE_HXX #define MPD_REPLAY_GAIN_MODE_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/SingleMode.hxx b/src/SingleMode.hxx index e7a740800..1cb109f88 100644 --- a/src/SingleMode.hxx +++ b/src/SingleMode.hxx @@ -20,7 +20,7 @@ #ifndef MPD_SINGLE_MODE_HXX #define MPD_SINGLE_MODE_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/SongLoader.hxx b/src/SongLoader.hxx index ffb337ab9..252eebcfc 100644 --- a/src/SongLoader.hxx +++ b/src/SongLoader.hxx @@ -21,7 +21,7 @@ #define MPD_SONG_LOADER_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/StateFile.hxx b/src/StateFile.hxx index de5b994d0..b577603be 100644 --- a/src/StateFile.hxx +++ b/src/StateFile.hxx @@ -23,7 +23,7 @@ #include "StateFileConfig.hxx" #include "event/TimerEvent.hxx" #include "fs/AllocatedPath.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/android/Environment.hxx b/src/android/Environment.hxx index b36425770..89d37d7af 100644 --- a/src/android/Environment.hxx +++ b/src/android/Environment.hxx @@ -20,7 +20,7 @@ #ifndef MPD_ANDROID_ENVIRONMENT_HXX #define MPD_ANDROID_ENVIRONMENT_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/client/Client.hxx b/src/client/Client.hxx index 457ea746b..7edbc97c4 100644 --- a/src/client/Client.hxx +++ b/src/client/Client.hxx @@ -26,7 +26,7 @@ #include "tag/Mask.hxx" #include "event/FullyBufferedSocket.hxx" #include "event/TimerEvent.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/client/ClientMessage.hxx b/src/client/ClientMessage.hxx index 1da871a60..41366d184 100644 --- a/src/client/ClientMessage.hxx +++ b/src/client/ClientMessage.hxx @@ -20,7 +20,7 @@ #ifndef MPD_CLIENT_MESSAGE_HXX #define MPD_CLIENT_MESSAGE_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/client/Response.hxx b/src/client/Response.hxx index ffe4720f4..2418e7d51 100644 --- a/src/client/Response.hxx +++ b/src/client/Response.hxx @@ -22,7 +22,7 @@ #include "check.h" #include "protocol/Ack.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/command/NeighborCommands.hxx b/src/command/NeighborCommands.hxx index 9c383c599..574f43132 100644 --- a/src/command/NeighborCommands.hxx +++ b/src/command/NeighborCommands.hxx @@ -21,7 +21,7 @@ #define MPD_NEIGHBOR_COMMANDS_HXX #include "CommandResult.hxx" -#include "Compiler.h" +#include "util/Compiler.h" struct Instance; class Client; diff --git a/src/command/PlaylistCommands.hxx b/src/command/PlaylistCommands.hxx index 9a787a7d2..97746469a 100644 --- a/src/command/PlaylistCommands.hxx +++ b/src/command/PlaylistCommands.hxx @@ -21,7 +21,7 @@ #define MPD_PLAYLIST_COMMANDS_HXX #include "CommandResult.hxx" -#include "Compiler.h" +#include "util/Compiler.h" class Client; class Request; diff --git a/src/config/Block.hxx b/src/config/Block.hxx index 035d8c395..e20f00116 100644 --- a/src/config/Block.hxx +++ b/src/config/Block.hxx @@ -22,7 +22,7 @@ #include "check.h" #include "Param.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/config/Check.hxx b/src/config/Check.hxx index 5f23b2198..ca6bf5a7d 100644 --- a/src/config/Check.hxx +++ b/src/config/Check.hxx @@ -21,7 +21,7 @@ #define MPD_CONFIG_CHECK_HXX #include "Option.hxx" -#include "Compiler.h" +#include "util/Compiler.h" struct ConfigData; diff --git a/src/config/Option.hxx b/src/config/Option.hxx index 6a66fff39..d98fab1a0 100644 --- a/src/config/Option.hxx +++ b/src/config/Option.hxx @@ -20,7 +20,7 @@ #ifndef MPD_CONFIG_OPTION_HXX #define MPD_CONFIG_OPTION_HXX -#include "Compiler.h" +#include "util/Compiler.h" #if defined(_WIN32) && CLANG_OR_GCC_VERSION(4,7) /* "INPUT" is declared by winuser.h */ diff --git a/src/config/Param.hxx b/src/config/Param.hxx index d7be49a55..bd0cefb5a 100644 --- a/src/config/Param.hxx +++ b/src/config/Param.hxx @@ -21,7 +21,7 @@ #define MPD_CONFIG_PARAM_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/db/Count.hxx b/src/db/Count.hxx index d31d39cd5..c8f855177 100644 --- a/src/db/Count.hxx +++ b/src/db/Count.hxx @@ -20,7 +20,7 @@ #ifndef MPD_DB_COUNT_HXX #define MPD_DB_COUNT_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/db/DatabaseGlue.hxx b/src/db/DatabaseGlue.hxx index 19ab87345..de1fb4a7a 100644 --- a/src/db/DatabaseGlue.hxx +++ b/src/db/DatabaseGlue.hxx @@ -20,7 +20,7 @@ #ifndef MPD_DATABASE_GLUE_HXX #define MPD_DATABASE_GLUE_HXX -#include "Compiler.h" +#include "util/Compiler.h" struct ConfigBlock; class EventLoop; diff --git a/src/db/DatabaseLock.hxx b/src/db/DatabaseLock.hxx index 4bcb17bc0..357cdd31c 100644 --- a/src/db/DatabaseLock.hxx +++ b/src/db/DatabaseLock.hxx @@ -28,7 +28,7 @@ #include "check.h" #include "thread/Mutex.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/db/DatabasePlaylist.hxx b/src/db/DatabasePlaylist.hxx index cdfb490a2..abf9dc10d 100644 --- a/src/db/DatabasePlaylist.hxx +++ b/src/db/DatabasePlaylist.hxx @@ -20,7 +20,7 @@ #ifndef MPD_DATABASE_PLAYLIST_HXX #define MPD_DATABASE_PLAYLIST_HXX -#include "Compiler.h" +#include "util/Compiler.h" class Database; class Storage; diff --git a/src/db/DatabaseSong.hxx b/src/db/DatabaseSong.hxx index 283c7ae5d..4e5ad4ea2 100644 --- a/src/db/DatabaseSong.hxx +++ b/src/db/DatabaseSong.hxx @@ -20,7 +20,7 @@ #ifndef MPD_DATABASE_SONG_HXX #define MPD_DATABASE_SONG_HXX -#include "Compiler.h" +#include "util/Compiler.h" struct LightSong; class Database; diff --git a/src/db/Interface.hxx b/src/db/Interface.hxx index 56cfcb82e..a8db2b12a 100644 --- a/src/db/Interface.hxx +++ b/src/db/Interface.hxx @@ -22,7 +22,7 @@ #include "Visitor.hxx" #include "tag/Type.h" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/db/LightDirectory.hxx b/src/db/LightDirectory.hxx index e066a1fbc..1e74f815a 100644 --- a/src/db/LightDirectory.hxx +++ b/src/db/LightDirectory.hxx @@ -20,7 +20,7 @@ #ifndef MPD_LIGHT_DIRECTORY_HXX #define MPD_LIGHT_DIRECTORY_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/db/PlaylistInfo.hxx b/src/db/PlaylistInfo.hxx index 6874a2b6c..e9a97b682 100644 --- a/src/db/PlaylistInfo.hxx +++ b/src/db/PlaylistInfo.hxx @@ -21,7 +21,7 @@ #define MPD_PLAYLIST_INFO_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/db/PlaylistVector.hxx b/src/db/PlaylistVector.hxx index 9075706f3..260211c9e 100644 --- a/src/db/PlaylistVector.hxx +++ b/src/db/PlaylistVector.hxx @@ -21,7 +21,7 @@ #define MPD_PLAYLIST_VECTOR_HXX #include "db/PlaylistInfo.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/db/Registry.hxx b/src/db/Registry.hxx index 71f107c42..eb2cea468 100644 --- a/src/db/Registry.hxx +++ b/src/db/Registry.hxx @@ -20,7 +20,7 @@ #ifndef MPD_DATABASE_REGISTRY_HXX #define MPD_DATABASE_REGISTRY_HXX -#include "Compiler.h" +#include "util/Compiler.h" struct DatabasePlugin; diff --git a/src/db/Selection.hxx b/src/db/Selection.hxx index 633f858c5..9a6e0bcd9 100644 --- a/src/db/Selection.hxx +++ b/src/db/Selection.hxx @@ -20,7 +20,7 @@ #ifndef MPD_DATABASE_SELECTION_HXX #define MPD_DATABASE_SELECTION_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/db/plugins/ProxyDatabasePlugin.cxx b/src/db/plugins/ProxyDatabasePlugin.cxx index 1a21f32c0..2920e204c 100644 --- a/src/db/plugins/ProxyDatabasePlugin.cxx +++ b/src/db/plugins/ProxyDatabasePlugin.cxx @@ -32,7 +32,7 @@ #include "song/UriSongFilter.hxx" #include "song/BaseSongFilter.hxx" #include "song/TagSongFilter.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include "config/Block.hxx" #include "tag/Builder.hxx" #include "tag/Tag.hxx" diff --git a/src/db/plugins/simple/Directory.hxx b/src/db/plugins/simple/Directory.hxx index 4a6fcd0a9..0dc2d337a 100644 --- a/src/db/plugins/simple/Directory.hxx +++ b/src/db/plugins/simple/Directory.hxx @@ -21,7 +21,7 @@ #define MPD_DIRECTORY_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include "db/Visitor.hxx" #include "db/PlaylistVector.hxx" #include "Song.hxx" diff --git a/src/db/plugins/simple/SimpleDatabasePlugin.hxx b/src/db/plugins/simple/SimpleDatabasePlugin.hxx index be5919c00..ab9c77ab2 100644 --- a/src/db/plugins/simple/SimpleDatabasePlugin.hxx +++ b/src/db/plugins/simple/SimpleDatabasePlugin.hxx @@ -25,7 +25,7 @@ #include "fs/AllocatedPath.hxx" #include "song/LightSong.hxx" #include "util/Manual.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/db/plugins/simple/Song.hxx b/src/db/plugins/simple/Song.hxx index 1cd344f9f..073748500 100644 --- a/src/db/plugins/simple/Song.hxx +++ b/src/db/plugins/simple/Song.hxx @@ -24,7 +24,7 @@ #include "Chrono.hxx" #include "tag/Tag.hxx" #include "AudioFormat.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/db/plugins/upnp/Directory.hxx b/src/db/plugins/upnp/Directory.hxx index 23d01039c..52988ef3f 100644 --- a/src/db/plugins/upnp/Directory.hxx +++ b/src/db/plugins/upnp/Directory.hxx @@ -21,7 +21,7 @@ #define MPD_UPNP_DIRECTORY_HXX #include "Object.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/db/plugins/upnp/Object.hxx b/src/db/plugins/upnp/Object.hxx index a234e842a..c65b81398 100644 --- a/src/db/plugins/upnp/Object.hxx +++ b/src/db/plugins/upnp/Object.hxx @@ -21,7 +21,7 @@ #define MPD_UPNP_OBJECT_HXX #include "tag/Tag.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/db/update/Editor.hxx b/src/db/update/Editor.hxx index a422b1542..2567847b4 100644 --- a/src/db/update/Editor.hxx +++ b/src/db/update/Editor.hxx @@ -22,7 +22,7 @@ #include "check.h" #include "Remove.hxx" -#include "Compiler.h" +#include "util/Compiler.h" struct Directory; struct Song; diff --git a/src/db/update/ExcludeList.hxx b/src/db/update/ExcludeList.hxx index 4a851a7dc..ada5c1b88 100644 --- a/src/db/update/ExcludeList.hxx +++ b/src/db/update/ExcludeList.hxx @@ -26,7 +26,7 @@ #define MPD_EXCLUDE_H #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include "fs/Glob.hxx" #include "input/Ptr.hxx" diff --git a/src/db/update/InotifySource.hxx b/src/db/update/InotifySource.hxx index a1c8a0374..8478b6ddf 100644 --- a/src/db/update/InotifySource.hxx +++ b/src/db/update/InotifySource.hxx @@ -21,7 +21,7 @@ #define MPD_INOTIFY_SOURCE_HXX #include "event/SocketMonitor.hxx" -#include "Compiler.h" +#include "util/Compiler.h" class FileDescriptor; diff --git a/src/db/update/InotifyUpdate.hxx b/src/db/update/InotifyUpdate.hxx index a58a38dcd..6004b061b 100644 --- a/src/db/update/InotifyUpdate.hxx +++ b/src/db/update/InotifyUpdate.hxx @@ -21,7 +21,7 @@ #define MPD_INOTIFY_UPDATE_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" class EventLoop; class Storage; diff --git a/src/db/update/Queue.hxx b/src/db/update/Queue.hxx index 63a7acbc6..8bffad9a4 100644 --- a/src/db/update/Queue.hxx +++ b/src/db/update/Queue.hxx @@ -21,7 +21,7 @@ #define MPD_UPDATE_QUEUE_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/db/update/Remove.hxx b/src/db/update/Remove.hxx index d34fa2049..cbcbdbe21 100644 --- a/src/db/update/Remove.hxx +++ b/src/db/update/Remove.hxx @@ -23,7 +23,7 @@ #include "check.h" #include "event/DeferEvent.hxx" #include "thread/Mutex.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/db/update/Service.hxx b/src/db/update/Service.hxx index 3f6284772..2872b6b3a 100644 --- a/src/db/update/Service.hxx +++ b/src/db/update/Service.hxx @@ -25,7 +25,7 @@ #include "Queue.hxx" #include "event/DeferEvent.hxx" #include "thread/Thread.hxx" -#include "Compiler.h" +#include "util/Compiler.h" class SimpleDatabase; class DatabaseListener; diff --git a/src/db/update/UpdateIO.hxx b/src/db/update/UpdateIO.hxx index b9f43105a..3acc167a0 100644 --- a/src/db/update/UpdateIO.hxx +++ b/src/db/update/UpdateIO.hxx @@ -21,7 +21,7 @@ #define MPD_UPDATE_IO_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" struct Directory; struct StorageFileInfo; diff --git a/src/db/update/Walk.hxx b/src/db/update/Walk.hxx index d16f5325e..4b04f16a7 100644 --- a/src/db/update/Walk.hxx +++ b/src/db/update/Walk.hxx @@ -23,7 +23,7 @@ #include "check.h" #include "Config.hxx" #include "Editor.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/decoder/Client.hxx b/src/decoder/Client.hxx index c1a702047..5abf43381 100644 --- a/src/decoder/Client.hxx +++ b/src/decoder/Client.hxx @@ -24,7 +24,7 @@ #include "DecoderCommand.hxx" #include "Chrono.hxx" #include "input/Ptr.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/decoder/DecoderBuffer.hxx b/src/decoder/DecoderBuffer.hxx index a7ba2f85f..8a70f068b 100644 --- a/src/decoder/DecoderBuffer.hxx +++ b/src/decoder/DecoderBuffer.hxx @@ -20,7 +20,7 @@ #ifndef MPD_DECODER_BUFFER_HXX #define MPD_DECODER_BUFFER_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include "util/DynamicFifoBuffer.hxx" #include "util/ConstBuffer.hxx" diff --git a/src/decoder/DecoderList.hxx b/src/decoder/DecoderList.hxx index bbb42d4bb..fd466ccf7 100644 --- a/src/decoder/DecoderList.hxx +++ b/src/decoder/DecoderList.hxx @@ -20,7 +20,7 @@ #ifndef MPD_DECODER_LIST_HXX #define MPD_DECODER_LIST_HXX -#include "Compiler.h" +#include "util/Compiler.h" struct ConfigData; struct DecoderPlugin; diff --git a/src/decoder/DecoderPlugin.hxx b/src/decoder/DecoderPlugin.hxx index d41086d8b..40419bea5 100644 --- a/src/decoder/DecoderPlugin.hxx +++ b/src/decoder/DecoderPlugin.hxx @@ -20,7 +20,7 @@ #ifndef MPD_DECODER_PLUGIN_HXX #define MPD_DECODER_PLUGIN_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/decoder/Reader.hxx b/src/decoder/Reader.hxx index 40542ae43..724622451 100644 --- a/src/decoder/Reader.hxx +++ b/src/decoder/Reader.hxx @@ -22,7 +22,7 @@ #include "check.h" #include "fs/io/Reader.hxx" -#include "Compiler.h" +#include "util/Compiler.h" class DecoderClient; class InputStream; diff --git a/src/decoder/plugins/DsdLib.hxx b/src/decoder/plugins/DsdLib.hxx index 06c61e500..804f78eab 100644 --- a/src/decoder/plugins/DsdLib.hxx +++ b/src/decoder/plugins/DsdLib.hxx @@ -22,7 +22,7 @@ #include "system/ByteOrder.hxx" #include "input/Offset.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/decoder/plugins/FlacInput.cxx b/src/decoder/plugins/FlacInput.cxx index 773c83cc9..e1e49dc86 100644 --- a/src/decoder/plugins/FlacInput.cxx +++ b/src/decoder/plugins/FlacInput.cxx @@ -23,7 +23,7 @@ #include "../DecoderAPI.hxx" #include "input/InputStream.hxx" #include "Log.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/encoder/EncoderInterface.hxx b/src/encoder/EncoderInterface.hxx index b8d610ffc..2ec67749d 100644 --- a/src/encoder/EncoderInterface.hxx +++ b/src/encoder/EncoderInterface.hxx @@ -21,7 +21,7 @@ #define MPD_ENCODER_INTERFACE_HXX #include "EncoderPlugin.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/encoder/plugins/NullEncoderPlugin.cxx b/src/encoder/plugins/NullEncoderPlugin.cxx index 10515d42d..dd5a6363d 100644 --- a/src/encoder/plugins/NullEncoderPlugin.cxx +++ b/src/encoder/plugins/NullEncoderPlugin.cxx @@ -21,7 +21,7 @@ #include "NullEncoderPlugin.hxx" #include "../EncoderAPI.hxx" #include "util/DynamicFifoBuffer.hxx" -#include "Compiler.h" +#include "util/Compiler.h" class NullEncoder final : public Encoder { DynamicFifoBuffer buffer; diff --git a/src/event/BufferedSocket.cxx b/src/event/BufferedSocket.cxx index 03acca2f5..86c8477a7 100644 --- a/src/event/BufferedSocket.cxx +++ b/src/event/BufferedSocket.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "BufferedSocket.hxx" #include "net/SocketError.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/event/Call.cxx b/src/event/Call.cxx index 369fe0f7f..097e7ab0e 100644 --- a/src/event/Call.cxx +++ b/src/event/Call.cxx @@ -23,7 +23,7 @@ #include "DeferEvent.hxx" #include "thread/Mutex.hxx" #include "thread/Cond.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/event/FullyBufferedSocket.cxx b/src/event/FullyBufferedSocket.cxx index 9fb588931..9460d1226 100644 --- a/src/event/FullyBufferedSocket.cxx +++ b/src/event/FullyBufferedSocket.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "FullyBufferedSocket.hxx" #include "net/SocketError.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/event/Loop.hxx b/src/event/Loop.hxx index 70028f385..31028efdd 100644 --- a/src/event/Loop.hxx +++ b/src/event/Loop.hxx @@ -22,7 +22,7 @@ #include "check.h" #include "thread/Id.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include "PollGroup.hxx" #include "thread/Mutex.hxx" diff --git a/src/event/MultiSocketMonitor.hxx b/src/event/MultiSocketMonitor.hxx index f030a7f59..c45175c5a 100644 --- a/src/event/MultiSocketMonitor.hxx +++ b/src/event/MultiSocketMonitor.hxx @@ -24,7 +24,7 @@ #include "IdleMonitor.hxx" #include "TimerEvent.hxx" #include "SocketMonitor.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/event/PollGroupEPoll.hxx b/src/event/PollGroupEPoll.hxx index 7a7032b77..f22ed3543 100644 --- a/src/event/PollGroupEPoll.hxx +++ b/src/event/PollGroupEPoll.hxx @@ -22,7 +22,7 @@ #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include "system/EPollFD.hxx" #include diff --git a/src/filter/FilterRegistry.hxx b/src/filter/FilterRegistry.hxx index 02855cd84..a8a584636 100644 --- a/src/filter/FilterRegistry.hxx +++ b/src/filter/FilterRegistry.hxx @@ -26,7 +26,7 @@ #ifndef MPD_FILTER_REGISTRY_HXX #define MPD_FILTER_REGISTRY_HXX -#include "Compiler.h" +#include "util/Compiler.h" struct FilterPlugin; diff --git a/src/filter/plugins/NullFilterPlugin.cxx b/src/filter/plugins/NullFilterPlugin.cxx index 037be79f4..17dd33514 100644 --- a/src/filter/plugins/NullFilterPlugin.cxx +++ b/src/filter/plugins/NullFilterPlugin.cxx @@ -30,7 +30,7 @@ #include "filter/Prepared.hxx" #include "filter/FilterRegistry.hxx" #include "AudioFormat.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include "util/ConstBuffer.hxx" class NullFilter final : public Filter { diff --git a/src/fs/AllocatedPath.cxx b/src/fs/AllocatedPath.cxx index afae0c872..bd5d8478f 100644 --- a/src/fs/AllocatedPath.cxx +++ b/src/fs/AllocatedPath.cxx @@ -21,7 +21,7 @@ #include "AllocatedPath.hxx" #include "Domain.hxx" #include "Charset.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/fs/AllocatedPath.hxx b/src/fs/AllocatedPath.hxx index 5df893928..b83d776cc 100644 --- a/src/fs/AllocatedPath.hxx +++ b/src/fs/AllocatedPath.hxx @@ -21,7 +21,7 @@ #define MPD_FS_ALLOCATED_PATH_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include "Traits.hxx" #include "Path.hxx" diff --git a/src/fs/Charset.hxx b/src/fs/Charset.hxx index de6cc22d0..5332b9910 100644 --- a/src/fs/Charset.hxx +++ b/src/fs/Charset.hxx @@ -21,7 +21,7 @@ #define MPD_FS_CHARSET_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include "Traits.hxx" #if (defined(HAVE_ICU) || defined(HAVE_ICONV)) && !defined(_WIN32) diff --git a/src/fs/Glob.hxx b/src/fs/Glob.hxx index b15972f0d..18176f094 100644 --- a/src/fs/Glob.hxx +++ b/src/fs/Glob.hxx @@ -33,7 +33,7 @@ #endif #ifdef HAVE_CLASS_GLOB -#include "Compiler.h" +#include "util/Compiler.h" /** * A pattern that matches file names. It may contain shell wildcards diff --git a/src/fs/Path.hxx b/src/fs/Path.hxx index eac017389..8561f4591 100644 --- a/src/fs/Path.hxx +++ b/src/fs/Path.hxx @@ -21,7 +21,7 @@ #define MPD_FS_PATH_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include "Traits.hxx" #include diff --git a/src/fs/Traits.hxx b/src/fs/Traits.hxx index 73339e444..a7d088a7f 100644 --- a/src/fs/Traits.hxx +++ b/src/fs/Traits.hxx @@ -21,7 +21,7 @@ #define MPD_FS_TRAITS_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include "util/StringPointer.hxx" #include "util/StringAPI.hxx" diff --git a/src/fs/io/AutoGunzipReader.hxx b/src/fs/io/AutoGunzipReader.hxx index 1e9705731..ae9521c7b 100644 --- a/src/fs/io/AutoGunzipReader.hxx +++ b/src/fs/io/AutoGunzipReader.hxx @@ -22,7 +22,7 @@ #include "check.h" #include "PeekReader.hxx" -#include "Compiler.h" +#include "util/Compiler.h" class GunzipReader; diff --git a/src/fs/io/BufferedOutputStream.hxx b/src/fs/io/BufferedOutputStream.hxx index c7f29a12a..0a8fae864 100644 --- a/src/fs/io/BufferedOutputStream.hxx +++ b/src/fs/io/BufferedOutputStream.hxx @@ -31,7 +31,7 @@ #define BUFFERED_OUTPUT_STREAM_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include "util/DynamicFifoBuffer.hxx" #include diff --git a/src/fs/io/BufferedReader.hxx b/src/fs/io/BufferedReader.hxx index c4c6da80f..01d6f141e 100644 --- a/src/fs/io/BufferedReader.hxx +++ b/src/fs/io/BufferedReader.hxx @@ -21,7 +21,7 @@ #define MPD_BUFFERED_READER_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include "util/DynamicFifoBuffer.hxx" #include diff --git a/src/fs/io/FileOutputStream.hxx b/src/fs/io/FileOutputStream.hxx index 876313b6c..ac4c3342e 100644 --- a/src/fs/io/FileOutputStream.hxx +++ b/src/fs/io/FileOutputStream.hxx @@ -33,7 +33,7 @@ #include "check.h" #include "OutputStream.hxx" #include "fs/AllocatedPath.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #ifndef _WIN32 #include "system/FileDescriptor.hxx" diff --git a/src/fs/io/FileReader.hxx b/src/fs/io/FileReader.hxx index d4d54564a..3904c550c 100644 --- a/src/fs/io/FileReader.hxx +++ b/src/fs/io/FileReader.hxx @@ -23,7 +23,7 @@ #include "check.h" #include "Reader.hxx" #include "fs/AllocatedPath.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #ifndef _WIN32 #include "system/FileDescriptor.hxx" diff --git a/src/fs/io/GunzipReader.hxx b/src/fs/io/GunzipReader.hxx index 100d2bc1c..18091ee7c 100644 --- a/src/fs/io/GunzipReader.hxx +++ b/src/fs/io/GunzipReader.hxx @@ -23,7 +23,7 @@ #include "check.h" #include "Reader.hxx" #include "util/StaticFifoBuffer.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/fs/io/GzipOutputStream.hxx b/src/fs/io/GzipOutputStream.hxx index 1051a7e90..99c18fe46 100644 --- a/src/fs/io/GzipOutputStream.hxx +++ b/src/fs/io/GzipOutputStream.hxx @@ -32,7 +32,7 @@ #include "check.h" #include "OutputStream.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/fs/io/PeekReader.hxx b/src/fs/io/PeekReader.hxx index 367d62f8b..70e91129e 100644 --- a/src/fs/io/PeekReader.hxx +++ b/src/fs/io/PeekReader.hxx @@ -22,7 +22,7 @@ #include "check.h" #include "Reader.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/fs/io/Reader.hxx b/src/fs/io/Reader.hxx index 7040e629c..868f8cb12 100644 --- a/src/fs/io/Reader.hxx +++ b/src/fs/io/Reader.hxx @@ -21,7 +21,7 @@ #define MPD_READER_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/fs/io/StdioOutputStream.hxx b/src/fs/io/StdioOutputStream.hxx index d04b7bd37..2369d6208 100644 --- a/src/fs/io/StdioOutputStream.hxx +++ b/src/fs/io/StdioOutputStream.hxx @@ -32,7 +32,7 @@ #include "check.h" #include "OutputStream.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/fs/io/TextFile.hxx b/src/fs/io/TextFile.hxx index 10cc8aabd..284b36d1e 100644 --- a/src/fs/io/TextFile.hxx +++ b/src/fs/io/TextFile.hxx @@ -21,7 +21,7 @@ #define MPD_TEXT_FILE_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" class Path; class FileReader; diff --git a/src/input/Error.hxx b/src/input/Error.hxx index b52b9d06b..c857f827e 100644 --- a/src/input/Error.hxx +++ b/src/input/Error.hxx @@ -21,7 +21,7 @@ #define INPUT_ERROR_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/input/IcyInputStream.hxx b/src/input/IcyInputStream.hxx index 59918a3a4..46b524008 100644 --- a/src/input/IcyInputStream.hxx +++ b/src/input/IcyInputStream.hxx @@ -21,7 +21,7 @@ #define MPD_ICY_INPUT_STREAM_HXX #include "ProxyInputStream.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/input/InputStream.hxx b/src/input/InputStream.hxx index 331ec96bb..0dad160b5 100644 --- a/src/input/InputStream.hxx +++ b/src/input/InputStream.hxx @@ -24,7 +24,7 @@ #include "Offset.hxx" #include "Ptr.hxx" #include "thread/Mutex.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/input/Reader.hxx b/src/input/Reader.hxx index 9032d372e..dae7d2832 100644 --- a/src/input/Reader.hxx +++ b/src/input/Reader.hxx @@ -22,7 +22,7 @@ #include "check.h" #include "fs/io/Reader.hxx" -#include "Compiler.h" +#include "util/Compiler.h" struct Decoder; class InputStream; diff --git a/src/java/Global.hxx b/src/java/Global.hxx index 49c7bc6f8..9d341b36c 100644 --- a/src/java/Global.hxx +++ b/src/java/Global.hxx @@ -30,7 +30,7 @@ #ifndef JAVA_GLOBAL_HXX #define JAVA_GLOBAL_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/lib/alsa/Format.hxx b/src/lib/alsa/Format.hxx index 145e4b3fc..9542072fd 100644 --- a/src/lib/alsa/Format.hxx +++ b/src/lib/alsa/Format.hxx @@ -22,7 +22,7 @@ #include "check.h" #include "pcm/SampleFormat.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/lib/alsa/Version.hxx b/src/lib/alsa/Version.hxx index c69c8bf79..844607473 100644 --- a/src/lib/alsa/Version.hxx +++ b/src/lib/alsa/Version.hxx @@ -20,7 +20,7 @@ #ifndef MPD_ALSA_VERSION_HXX #define MPD_ALSA_VERSION_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/lib/curl/Version.hxx b/src/lib/curl/Version.hxx index c854a0d58..9e9a319d3 100644 --- a/src/lib/curl/Version.hxx +++ b/src/lib/curl/Version.hxx @@ -30,7 +30,7 @@ #ifndef CURL_VERSION_HXX #define CURL_VERSION_HXX -#include "Compiler.h" +#include "util/Compiler.h" gcc_const bool diff --git a/src/lib/dbus/Error.hxx b/src/lib/dbus/Error.hxx index 602dca892..9f1deb8f2 100644 --- a/src/lib/dbus/Error.hxx +++ b/src/lib/dbus/Error.hxx @@ -33,7 +33,7 @@ #ifndef ODBUS_ERROR_HXX #define ODBUS_ERROR_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/lib/dbus/UDisks2.cxx b/src/lib/dbus/UDisks2.cxx index 18610ecb7..2476668f4 100644 --- a/src/lib/dbus/UDisks2.cxx +++ b/src/lib/dbus/UDisks2.cxx @@ -22,7 +22,7 @@ #include "ReadIter.hxx" #include "ObjectManager.hxx" #include "util/StringAPI.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/lib/dbus/Watch.hxx b/src/lib/dbus/Watch.hxx index 554be2ab8..939793043 100644 --- a/src/lib/dbus/Watch.hxx +++ b/src/lib/dbus/Watch.hxx @@ -36,7 +36,7 @@ #include "Connection.hxx" #include "event/SocketMonitor.hxx" #include "event/DeferEvent.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/lib/expat/ExpatParser.hxx b/src/lib/expat/ExpatParser.hxx index ff91cfb0a..72736ef98 100644 --- a/src/lib/expat/ExpatParser.hxx +++ b/src/lib/expat/ExpatParser.hxx @@ -21,7 +21,7 @@ #define MPD_EXPAT_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/lib/ffmpeg/Time.hxx b/src/lib/ffmpeg/Time.hxx index 71f7edd22..cba1fe4c1 100644 --- a/src/lib/ffmpeg/Time.hxx +++ b/src/lib/ffmpeg/Time.hxx @@ -21,7 +21,7 @@ #define MPD_FFMPEG_TIME_HXX #include "Chrono.hxx" -#include "Compiler.h" +#include "util/Compiler.h" extern "C" { #include diff --git a/src/lib/gcrypt/Hash.hxx b/src/lib/gcrypt/Hash.hxx index 208d6e247..0503112d0 100644 --- a/src/lib/gcrypt/Hash.hxx +++ b/src/lib/gcrypt/Hash.hxx @@ -31,7 +31,7 @@ #define GCRYPT_HASH_HXX #include "util/ConstBuffer.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/lib/gcrypt/MD5.hxx b/src/lib/gcrypt/MD5.hxx index 478a7ef12..03bfb0347 100644 --- a/src/lib/gcrypt/MD5.hxx +++ b/src/lib/gcrypt/MD5.hxx @@ -31,7 +31,7 @@ #define GCRYPT_MD5_HXX #include "util/StringBuffer.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/lib/icu/CaseFold.hxx b/src/lib/icu/CaseFold.hxx index eaeaf5689..5f13b5b00 100644 --- a/src/lib/icu/CaseFold.hxx +++ b/src/lib/icu/CaseFold.hxx @@ -25,7 +25,7 @@ #if defined(HAVE_ICU) || defined(_WIN32) #define HAVE_ICU_CASE_FOLD -#include "Compiler.h" +#include "util/Compiler.h" template class AllocatedString; diff --git a/src/lib/icu/Collate.hxx b/src/lib/icu/Collate.hxx index d22fa6870..f7c19ebc2 100644 --- a/src/lib/icu/Collate.hxx +++ b/src/lib/icu/Collate.hxx @@ -21,7 +21,7 @@ #define MPD_ICU_COLLATE_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" /** * Throws #std::runtime_error on error. diff --git a/src/lib/icu/Compare.hxx b/src/lib/icu/Compare.hxx index d38026508..f3901fe4e 100644 --- a/src/lib/icu/Compare.hxx +++ b/src/lib/icu/Compare.hxx @@ -21,7 +21,7 @@ #define MPD_ICU_COMPARE_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include "util/AllocatedString.hxx" /** diff --git a/src/lib/icu/Converter.hxx b/src/lib/icu/Converter.hxx index 7ce545cf6..cdb06dd5a 100644 --- a/src/lib/icu/Converter.hxx +++ b/src/lib/icu/Converter.hxx @@ -21,7 +21,7 @@ #define MPD_ICU_CONVERTER_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #ifdef HAVE_ICU #include "thread/Mutex.hxx" diff --git a/src/lib/icu/Win32.hxx b/src/lib/icu/Win32.hxx index c3aed87a4..609680fa2 100644 --- a/src/lib/icu/Win32.hxx +++ b/src/lib/icu/Win32.hxx @@ -21,7 +21,7 @@ #define MPD_ICU_WIN32_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/lib/nfs/Base.hxx b/src/lib/nfs/Base.hxx index e3dd65238..9dead5e73 100644 --- a/src/lib/nfs/Base.hxx +++ b/src/lib/nfs/Base.hxx @@ -21,7 +21,7 @@ #define MPD_NFS_BASE_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" /** * Set the "base" NFS server and export name. This will be the diff --git a/src/lib/nfs/Cancellable.hxx b/src/lib/nfs/Cancellable.hxx index 89635bec7..6e7890150 100644 --- a/src/lib/nfs/Cancellable.hxx +++ b/src/lib/nfs/Cancellable.hxx @@ -20,7 +20,7 @@ #ifndef MPD_NFS_CANCELLABLE_HXX #define MPD_NFS_CANCELLABLE_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/lib/nfs/FileReader.hxx b/src/lib/nfs/FileReader.hxx index 8447036d4..da06f6fc1 100644 --- a/src/lib/nfs/FileReader.hxx +++ b/src/lib/nfs/FileReader.hxx @@ -24,7 +24,7 @@ #include "Lease.hxx" #include "Callback.hxx" #include "event/DeferEvent.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/lib/nfs/Glue.hxx b/src/lib/nfs/Glue.hxx index 28dba89c2..0bf3aa58f 100644 --- a/src/lib/nfs/Glue.hxx +++ b/src/lib/nfs/Glue.hxx @@ -21,7 +21,7 @@ #define MPD_NFS_GLUE_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" class EventLoop; class NfsConnection; diff --git a/src/lib/nfs/Manager.hxx b/src/lib/nfs/Manager.hxx index 120c65c9e..0cf10eac5 100644 --- a/src/lib/nfs/Manager.hxx +++ b/src/lib/nfs/Manager.hxx @@ -22,7 +22,7 @@ #include "check.h" #include "Connection.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include "event/IdleMonitor.hxx" #include diff --git a/src/lib/upnp/Action.hxx b/src/lib/upnp/Action.hxx index 03c200bfc..3603c2f7c 100644 --- a/src/lib/upnp/Action.hxx +++ b/src/lib/upnp/Action.hxx @@ -20,7 +20,7 @@ #ifndef MPD_UPNP_ACTION_HXX #define MPD_UPNP_ACTION_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/lib/upnp/Compat.hxx b/src/lib/upnp/Compat.hxx index b4b5bd01b..cf3e0dca1 100644 --- a/src/lib/upnp/Compat.hxx +++ b/src/lib/upnp/Compat.hxx @@ -30,7 +30,7 @@ using UpnpDiscovery = Upnp_Discovery; #endif #if UPNP_VERSION < 10624 -#include "Compiler.h" +#include "util/Compiler.h" gcc_pure static inline int diff --git a/src/lib/upnp/ContentDirectoryService.hxx b/src/lib/upnp/ContentDirectoryService.hxx index 55fae6a56..5a14d1cc0 100644 --- a/src/lib/upnp/ContentDirectoryService.hxx +++ b/src/lib/upnp/ContentDirectoryService.hxx @@ -20,7 +20,7 @@ #ifndef _UPNPDIR_HXX_INCLUDED_ #define _UPNPDIR_HXX_INCLUDED_ -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/lib/upnp/Discovery.hxx b/src/lib/upnp/Discovery.hxx index 0750caf47..9cb6535e7 100644 --- a/src/lib/upnp/Discovery.hxx +++ b/src/lib/upnp/Discovery.hxx @@ -28,7 +28,7 @@ #include "lib/curl/Request.hxx" #include "thread/Mutex.hxx" #include "event/DeferEvent.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/lib/upnp/Util.hxx b/src/lib/upnp/Util.hxx index de1950d5b..0b5a435b5 100644 --- a/src/lib/upnp/Util.hxx +++ b/src/lib/upnp/Util.hxx @@ -20,7 +20,7 @@ #ifndef MPD_UPNP_UTIL_HXX #define MPD_UPNP_UTIL_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/lib/xiph/FlacIOHandle.cxx b/src/lib/xiph/FlacIOHandle.cxx index 1d648637e..b4da537aa 100644 --- a/src/lib/xiph/FlacIOHandle.cxx +++ b/src/lib/xiph/FlacIOHandle.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "FlacIOHandle.hxx" #include "Log.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include "system/Error.hxx" #include diff --git a/src/lib/xiph/FlacIOHandle.hxx b/src/lib/xiph/FlacIOHandle.hxx index 2c54bbe5e..33bf8d5fe 100644 --- a/src/lib/xiph/FlacIOHandle.hxx +++ b/src/lib/xiph/FlacIOHandle.hxx @@ -20,7 +20,7 @@ #ifndef MPD_FLAC_IO_HANDLE_HXX #define MPD_FLAC_IO_HANDLE_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include "input/InputStream.hxx" #include diff --git a/src/lib/xiph/FlacMetadataChain.hxx b/src/lib/xiph/FlacMetadataChain.hxx index bc62c4ca2..8394e1018 100644 --- a/src/lib/xiph/FlacMetadataChain.hxx +++ b/src/lib/xiph/FlacMetadataChain.hxx @@ -20,7 +20,7 @@ #ifndef MPD_FLAC_METADATA_CHAIN_HXX #define MPD_FLAC_METADATA_CHAIN_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/lib/xiph/FlacMetadataIterator.hxx b/src/lib/xiph/FlacMetadataIterator.hxx index b837c3f2a..fd2fd2818 100644 --- a/src/lib/xiph/FlacMetadataIterator.hxx +++ b/src/lib/xiph/FlacMetadataIterator.hxx @@ -20,7 +20,7 @@ #ifndef MPD_FLAC_METADATA_ITERATOR_HXX #define MPD_FLAC_METADATA_ITERATOR_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/lib/xiph/OggSerial.cxx b/src/lib/xiph/OggSerial.cxx index 70b7fa46a..97e9476c4 100644 --- a/src/lib/xiph/OggSerial.cxx +++ b/src/lib/xiph/OggSerial.cxx @@ -18,7 +18,7 @@ */ #include "OggSerial.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/ls.hxx b/src/ls.hxx index b8c8f249a..aec5d8623 100644 --- a/src/ls.hxx +++ b/src/ls.hxx @@ -20,7 +20,7 @@ #ifndef MPD_LS_HXX #define MPD_LS_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/mixer/MixerInternal.hxx b/src/mixer/MixerInternal.hxx index 34ee0a1d7..9943bd4c5 100644 --- a/src/mixer/MixerInternal.hxx +++ b/src/mixer/MixerInternal.hxx @@ -23,7 +23,7 @@ #include "MixerPlugin.hxx" #include "MixerList.hxx" #include "thread/Mutex.hxx" -#include "Compiler.h" +#include "util/Compiler.h" class MixerListener; diff --git a/src/mixer/MixerType.hxx b/src/mixer/MixerType.hxx index ce2832981..ec1d0ff02 100644 --- a/src/mixer/MixerType.hxx +++ b/src/mixer/MixerType.hxx @@ -20,7 +20,7 @@ #ifndef MPD_MIXER_TYPE_HXX #define MPD_MIXER_TYPE_HXX -#include "Compiler.h" +#include "util/Compiler.h" enum class MixerType { /** mixer disabled */ diff --git a/src/mixer/Volume.hxx b/src/mixer/Volume.hxx index 5ca467d77..3e1cf9a42 100644 --- a/src/mixer/Volume.hxx +++ b/src/mixer/Volume.hxx @@ -20,7 +20,7 @@ #ifndef MPD_VOLUME_HXX #define MPD_VOLUME_HXX -#include "Compiler.h" +#include "util/Compiler.h" class MultipleOutputs; class BufferedOutputStream; diff --git a/src/mixer/plugins/HaikuMixerPlugin.cxx b/src/mixer/plugins/HaikuMixerPlugin.cxx index f0b50a91c..9a24ce48a 100644 --- a/src/mixer/plugins/HaikuMixerPlugin.cxx +++ b/src/mixer/plugins/HaikuMixerPlugin.cxx @@ -23,7 +23,7 @@ #include "config.h" #include "mixer/MixerInternal.hxx" #include "output/plugins/HaikuOutputPlugin.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include "util/RuntimeError.hxx" diff --git a/src/mixer/plugins/RoarMixerPlugin.cxx b/src/mixer/plugins/RoarMixerPlugin.cxx index d3df5f910..77dd2cc44 100644 --- a/src/mixer/plugins/RoarMixerPlugin.cxx +++ b/src/mixer/plugins/RoarMixerPlugin.cxx @@ -22,7 +22,7 @@ #include "config.h" #include "mixer/MixerInternal.hxx" #include "output/plugins/RoarOutputPlugin.hxx" -#include "Compiler.h" +#include "util/Compiler.h" class RoarMixer final : public Mixer { /** the base mixer class */ diff --git a/src/neighbor/Glue.hxx b/src/neighbor/Glue.hxx index 732841511..6ae247582 100644 --- a/src/neighbor/Glue.hxx +++ b/src/neighbor/Glue.hxx @@ -21,7 +21,7 @@ #define MPD_NEIGHBOR_ALL_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include "thread/Mutex.hxx" #include diff --git a/src/neighbor/Registry.hxx b/src/neighbor/Registry.hxx index 5e9ddfb62..389030543 100644 --- a/src/neighbor/Registry.hxx +++ b/src/neighbor/Registry.hxx @@ -20,7 +20,7 @@ #ifndef MPD_NEIGHBOR_REGISTRY_HXX #define MPD_NEIGHBOR_REGISTRY_HXX -#include "Compiler.h" +#include "util/Compiler.h" struct NeighborPlugin; diff --git a/src/net/AllocatedSocketAddress.hxx b/src/net/AllocatedSocketAddress.hxx index 30ed8d819..772ae9657 100644 --- a/src/net/AllocatedSocketAddress.hxx +++ b/src/net/AllocatedSocketAddress.hxx @@ -32,7 +32,7 @@ #include "SocketAddress.hxx" #include "Features.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/net/Resolver.hxx b/src/net/Resolver.hxx index ad4faba36..1f8b89659 100644 --- a/src/net/Resolver.hxx +++ b/src/net/Resolver.hxx @@ -21,7 +21,7 @@ #define MPD_RESOLVER_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" struct addrinfo; diff --git a/src/net/SocketAddress.hxx b/src/net/SocketAddress.hxx index b83cbf5b0..d7b022d97 100644 --- a/src/net/SocketAddress.hxx +++ b/src/net/SocketAddress.hxx @@ -31,7 +31,7 @@ #define SOCKET_ADDRESS_HXX #include "Features.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/net/SocketError.hxx b/src/net/SocketError.hxx index c4caac646..03a932e55 100644 --- a/src/net/SocketError.hxx +++ b/src/net/SocketError.hxx @@ -20,7 +20,7 @@ #ifndef MPD_SOCKET_ERROR_HXX #define MPD_SOCKET_ERROR_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include "system/Error.hxx" #ifdef _WIN32 diff --git a/src/net/StaticSocketAddress.hxx b/src/net/StaticSocketAddress.hxx index 5da2cb3d7..8b9e8ecde 100644 --- a/src/net/StaticSocketAddress.hxx +++ b/src/net/StaticSocketAddress.hxx @@ -31,7 +31,7 @@ #define STATIC_SOCKET_ADDRESS_HXX #include "SocketAddress.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/net/ToString.hxx b/src/net/ToString.hxx index 4eef8656d..3dbf3d45e 100644 --- a/src/net/ToString.hxx +++ b/src/net/ToString.hxx @@ -31,7 +31,7 @@ #define NET_TO_STRING_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/output/Control.hxx b/src/output/Control.hxx index 711f86382..72016e989 100644 --- a/src/output/Control.hxx +++ b/src/output/Control.hxx @@ -26,7 +26,7 @@ #include "thread/Mutex.hxx" #include "thread/Cond.hxx" #include "system/PeriodClock.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/output/Interface.cxx b/src/output/Interface.cxx index 5480642df..69c2b0a0f 100644 --- a/src/output/Interface.cxx +++ b/src/output/Interface.cxx @@ -18,7 +18,7 @@ */ #include "Interface.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/output/MultipleOutputs.hxx b/src/output/MultipleOutputs.hxx index 7e9e201f4..c69adc4a1 100644 --- a/src/output/MultipleOutputs.hxx +++ b/src/output/MultipleOutputs.hxx @@ -32,7 +32,7 @@ #include "AudioFormat.hxx" #include "ReplayGainMode.hxx" #include "Chrono.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/output/OutputPlugin.hxx b/src/output/OutputPlugin.hxx index f55aebc78..cc2f1a068 100644 --- a/src/output/OutputPlugin.hxx +++ b/src/output/OutputPlugin.hxx @@ -20,7 +20,7 @@ #ifndef MPD_OUTPUT_PLUGIN_HXX #define MPD_OUTPUT_PLUGIN_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/output/SharedPipeConsumer.hxx b/src/output/SharedPipeConsumer.hxx index 4b9efd48f..e29281638 100644 --- a/src/output/SharedPipeConsumer.hxx +++ b/src/output/SharedPipeConsumer.hxx @@ -21,7 +21,7 @@ #define SHARED_PIPE_CONSUMER_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/output/Source.hxx b/src/output/Source.hxx index 435ce52b2..783b7cdae 100644 --- a/src/output/Source.hxx +++ b/src/output/Source.hxx @@ -21,7 +21,7 @@ #define AUDIO_OUTPUT_SOURCE_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include "SharedPipeConsumer.hxx" #include "AudioFormat.hxx" #include "ReplayGainMode.hxx" diff --git a/src/output/plugins/WinmmOutputPlugin.hxx b/src/output/plugins/WinmmOutputPlugin.hxx index 55f1439d4..deae2da42 100644 --- a/src/output/plugins/WinmmOutputPlugin.hxx +++ b/src/output/plugins/WinmmOutputPlugin.hxx @@ -24,7 +24,7 @@ #ifdef ENABLE_WINMM_OUTPUT -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/output/plugins/httpd/HttpdClient.hxx b/src/output/plugins/httpd/HttpdClient.hxx index 9d061f43d..d49d4ae1c 100644 --- a/src/output/plugins/httpd/HttpdClient.hxx +++ b/src/output/plugins/httpd/HttpdClient.hxx @@ -22,7 +22,7 @@ #include "Page.hxx" #include "event/BufferedSocket.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/output/plugins/httpd/HttpdInternal.hxx b/src/output/plugins/httpd/HttpdInternal.hxx index 9a99fdbc8..80d8928d6 100644 --- a/src/output/plugins/httpd/HttpdInternal.hxx +++ b/src/output/plugins/httpd/HttpdInternal.hxx @@ -33,7 +33,7 @@ #include "event/ServerSocket.hxx" #include "event/DeferEvent.hxx" #include "util/Cast.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/pcm/FallbackResampler.hxx b/src/pcm/FallbackResampler.hxx index ec82b301d..960735224 100644 --- a/src/pcm/FallbackResampler.hxx +++ b/src/pcm/FallbackResampler.hxx @@ -23,7 +23,7 @@ #include "Resampler.hxx" #include "PcmBuffer.hxx" #include "AudioFormat.hxx" -#include "Compiler.h" +#include "util/Compiler.h" /** * A naive resampler that is used when no external library was found diff --git a/src/pcm/Interleave.hxx b/src/pcm/Interleave.hxx index a94bc67f6..f2f98210d 100644 --- a/src/pcm/Interleave.hxx +++ b/src/pcm/Interleave.hxx @@ -21,7 +21,7 @@ #define MPD_PCM_INTERLEAVE_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include "util/ConstBuffer.hxx" #include diff --git a/src/pcm/LibsamplerateResampler.hxx b/src/pcm/LibsamplerateResampler.hxx index 988a0575d..31cb7ddf4 100644 --- a/src/pcm/LibsamplerateResampler.hxx +++ b/src/pcm/LibsamplerateResampler.hxx @@ -23,7 +23,7 @@ #include "Resampler.hxx" #include "PcmBuffer.hxx" #include "AudioFormat.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/pcm/PcmBuffer.hxx b/src/pcm/PcmBuffer.hxx index f7917554c..e57657015 100644 --- a/src/pcm/PcmBuffer.hxx +++ b/src/pcm/PcmBuffer.hxx @@ -21,7 +21,7 @@ #define PCM_BUFFER_HXX #include "util/ReusableArray.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/pcm/PcmMix.hxx b/src/pcm/PcmMix.hxx index 7f08a9409..c1c2b8f45 100644 --- a/src/pcm/PcmMix.hxx +++ b/src/pcm/PcmMix.hxx @@ -21,7 +21,7 @@ #define MPD_PCM_MIX_HXX #include "SampleFormat.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/pcm/PcmUtils.hxx b/src/pcm/PcmUtils.hxx index b3bc058fa..2461ba2a9 100644 --- a/src/pcm/PcmUtils.hxx +++ b/src/pcm/PcmUtils.hxx @@ -20,7 +20,7 @@ #ifndef MPD_PCM_UTILS_H #define MPD_PCM_UTILS_H -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/pcm/Resampler.hxx b/src/pcm/Resampler.hxx index 7f2c5ae4c..40b8a9e93 100644 --- a/src/pcm/Resampler.hxx +++ b/src/pcm/Resampler.hxx @@ -21,7 +21,7 @@ #define MPD_PCM_RESAMPLER_HXX #include "util/ConstBuffer.hxx" -#include "Compiler.h" +#include "util/Compiler.h" struct AudioFormat; diff --git a/src/pcm/SampleFormat.hxx b/src/pcm/SampleFormat.hxx index 92c081f99..a271e8a82 100644 --- a/src/pcm/SampleFormat.hxx +++ b/src/pcm/SampleFormat.hxx @@ -20,7 +20,7 @@ #ifndef MPD_PCM_SAMPLE_FORMAT_HXX #define MPD_PCM_SAMPLE_FORMAT_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/pcm/SoxrResampler.hxx b/src/pcm/SoxrResampler.hxx index 735a24a85..31142a7df 100644 --- a/src/pcm/SoxrResampler.hxx +++ b/src/pcm/SoxrResampler.hxx @@ -22,7 +22,7 @@ #include "Resampler.hxx" #include "PcmBuffer.hxx" -#include "Compiler.h" +#include "util/Compiler.h" struct AudioFormat; struct ConfigBlock; diff --git a/src/player/CrossFade.hxx b/src/player/CrossFade.hxx index 9241006d8..2bdd3f0a0 100644 --- a/src/player/CrossFade.hxx +++ b/src/player/CrossFade.hxx @@ -20,7 +20,7 @@ #ifndef MPD_CROSSFADE_HXX #define MPD_CROSSFADE_HXX -#include "Compiler.h" +#include "util/Compiler.h" struct AudioFormat; class SignedSongTime; diff --git a/src/player/Outputs.hxx b/src/player/Outputs.hxx index 54e340931..225ec5836 100644 --- a/src/player/Outputs.hxx +++ b/src/player/Outputs.hxx @@ -22,7 +22,7 @@ #include "MusicChunkPtr.hxx" #include "Chrono.hxx" -#include "Compiler.h" +#include "util/Compiler.h" struct AudioFormat; struct MusicChunk; diff --git a/src/playlist/MemorySongEnumerator.hxx b/src/playlist/MemorySongEnumerator.hxx index 7b9f78d13..f59d1f87d 100644 --- a/src/playlist/MemorySongEnumerator.hxx +++ b/src/playlist/MemorySongEnumerator.hxx @@ -22,7 +22,7 @@ #include "SongEnumerator.hxx" #include "song/DetachedSong.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/playlist/PlaylistRegistry.hxx b/src/playlist/PlaylistRegistry.hxx index 9f56dddf1..b184b989d 100644 --- a/src/playlist/PlaylistRegistry.hxx +++ b/src/playlist/PlaylistRegistry.hxx @@ -21,7 +21,7 @@ #define MPD_PLAYLIST_REGISTRY_HXX #include "input/Ptr.hxx" -#include "Compiler.h" +#include "util/Compiler.h" struct ConfigData; class Mutex; diff --git a/src/playlist/PlaylistStream.hxx b/src/playlist/PlaylistStream.hxx index 46742e970..4001ced63 100644 --- a/src/playlist/PlaylistStream.hxx +++ b/src/playlist/PlaylistStream.hxx @@ -20,7 +20,7 @@ #ifndef MPD_PLAYLIST_STREAM_HXX #define MPD_PLAYLIST_STREAM_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/playlist/cue/CueParser.hxx b/src/playlist/cue/CueParser.hxx index c9e344c98..85e114722 100644 --- a/src/playlist/cue/CueParser.hxx +++ b/src/playlist/cue/CueParser.hxx @@ -23,7 +23,7 @@ #include "check.h" #include "song/DetachedSong.hxx" #include "tag/Builder.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/queue/IdTable.hxx b/src/queue/IdTable.hxx index 5be7c7e4e..a632ec545 100644 --- a/src/queue/IdTable.hxx +++ b/src/queue/IdTable.hxx @@ -20,7 +20,7 @@ #ifndef MPD_ID_TABLE_HXX #define MPD_ID_TABLE_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/queue/Queue.hxx b/src/queue/Queue.hxx index 886ea31bb..f3e2854d0 100644 --- a/src/queue/Queue.hxx +++ b/src/queue/Queue.hxx @@ -20,7 +20,7 @@ #ifndef MPD_QUEUE_HXX #define MPD_QUEUE_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include "IdTable.hxx" #include "SingleMode.hxx" #include "util/LazyRandomEngine.hxx" diff --git a/src/song/AndSongFilter.hxx b/src/song/AndSongFilter.hxx index 5c3869d93..bc9cb3468 100644 --- a/src/song/AndSongFilter.hxx +++ b/src/song/AndSongFilter.hxx @@ -21,7 +21,7 @@ #define MPD_AND_SONG_FILTER_HXX #include "ISongFilter.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/song/BaseSongFilter.hxx b/src/song/BaseSongFilter.hxx index d5a049bf2..d0d2aab39 100644 --- a/src/song/BaseSongFilter.hxx +++ b/src/song/BaseSongFilter.hxx @@ -21,7 +21,7 @@ #define MPD_BASE_SONG_FILTER_HXX #include "ISongFilter.hxx" -#include "Compiler.h" +#include "util/Compiler.h" class BaseSongFilter final : public ISongFilter { std::string value; diff --git a/src/song/DetachedSong.hxx b/src/song/DetachedSong.hxx index a161ad427..d45439d0a 100644 --- a/src/song/DetachedSong.hxx +++ b/src/song/DetachedSong.hxx @@ -23,7 +23,7 @@ #include "check.h" #include "tag/Tag.hxx" #include "Chrono.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/song/Filter.hxx b/src/song/Filter.hxx index 5164ee888..771f0d6c8 100644 --- a/src/song/Filter.hxx +++ b/src/song/Filter.hxx @@ -21,7 +21,7 @@ #define MPD_SONG_FILTER_HXX #include "AndSongFilter.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/song/ISongFilter.hxx b/src/song/ISongFilter.hxx index 22e746148..7ff8b3418 100644 --- a/src/song/ISongFilter.hxx +++ b/src/song/ISongFilter.hxx @@ -20,7 +20,7 @@ #ifndef MPD_I_SONG_FILTER_HXX #define MPD_I_SONG_FILTER_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/song/LightSong.hxx b/src/song/LightSong.hxx index 7bc21e030..8fa06ea4d 100644 --- a/src/song/LightSong.hxx +++ b/src/song/LightSong.hxx @@ -22,7 +22,7 @@ #include "Chrono.hxx" #include "AudioFormat.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/song/StringFilter.hxx b/src/song/StringFilter.hxx index da809f3a3..8c39b5f69 100644 --- a/src/song/StringFilter.hxx +++ b/src/song/StringFilter.hxx @@ -21,7 +21,7 @@ #define MPD_STRING_FILTER_HXX #include "lib/icu/Compare.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/sticker/StickerDatabase.hxx b/src/sticker/StickerDatabase.hxx index e533fbfbe..ecb735c90 100644 --- a/src/sticker/StickerDatabase.hxx +++ b/src/sticker/StickerDatabase.hxx @@ -43,7 +43,7 @@ #define MPD_STICKER_DATABASE_HXX #include "Match.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/storage/CompositeStorage.hxx b/src/storage/CompositeStorage.hxx index a586b9c46..ed1c412a0 100644 --- a/src/storage/CompositeStorage.hxx +++ b/src/storage/CompositeStorage.hxx @@ -23,7 +23,7 @@ #include "check.h" #include "StorageInterface.hxx" #include "thread/Mutex.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/storage/Configured.hxx b/src/storage/Configured.hxx index 068c7a498..b5091fde8 100644 --- a/src/storage/Configured.hxx +++ b/src/storage/Configured.hxx @@ -21,7 +21,7 @@ #define MPD_STORAGE_CONFIG_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/storage/Registry.hxx b/src/storage/Registry.hxx index 4a4136067..648d6efc5 100644 --- a/src/storage/Registry.hxx +++ b/src/storage/Registry.hxx @@ -21,7 +21,7 @@ #define MPD_STORAGE_REGISTRY_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/storage/StorageInterface.hxx b/src/storage/StorageInterface.hxx index dbad0c041..edd0638b2 100644 --- a/src/storage/StorageInterface.hxx +++ b/src/storage/StorageInterface.hxx @@ -21,7 +21,7 @@ #define MPD_STORAGE_INTERFACE_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/storage/plugins/LocalStorage.hxx b/src/storage/plugins/LocalStorage.hxx index ae1a89ee2..3e943a2ed 100644 --- a/src/storage/plugins/LocalStorage.hxx +++ b/src/storage/plugins/LocalStorage.hxx @@ -21,7 +21,7 @@ #define MPD_STORAGE_LOCAL_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/system/ByteOrder.hxx b/src/system/ByteOrder.hxx index edeeb31c3..8ed3b6c72 100644 --- a/src/system/ByteOrder.hxx +++ b/src/system/ByteOrder.hxx @@ -30,7 +30,7 @@ #ifndef BYTE_ORDER_HXX #define BYTE_ORDER_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/system/Clock.hxx b/src/system/Clock.hxx index 222ac4848..6c034f5d7 100644 --- a/src/system/Clock.hxx +++ b/src/system/Clock.hxx @@ -20,7 +20,7 @@ #ifndef MPD_CLOCK_H #define MPD_CLOCK_H -#include "Compiler.h" +#include "util/Compiler.h" #ifdef _WIN32 diff --git a/src/system/Error.hxx b/src/system/Error.hxx index f65a602b3..a94678872 100644 --- a/src/system/Error.hxx +++ b/src/system/Error.hxx @@ -30,7 +30,7 @@ #ifndef SYSTEM_ERROR_HXX #define SYSTEM_ERROR_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/system/EventFD.cxx b/src/system/EventFD.cxx index 1103176c4..d6f43f32e 100644 --- a/src/system/EventFD.cxx +++ b/src/system/EventFD.cxx @@ -21,7 +21,7 @@ #ifdef USE_EVENTFD #include "EventFD.hxx" #include "system/Error.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/system/EventPipe.cxx b/src/system/EventPipe.cxx index 075c2fa0a..a7f25fb5d 100644 --- a/src/system/EventPipe.cxx +++ b/src/system/EventPipe.cxx @@ -22,7 +22,7 @@ #include "FileDescriptor.hxx" #include "system/Error.hxx" #include "util/ScopeExit.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/system/FatalError.hxx b/src/system/FatalError.hxx index c692a2c39..ffb82db1d 100644 --- a/src/system/FatalError.hxx +++ b/src/system/FatalError.hxx @@ -21,7 +21,7 @@ #define MPD_FATAL_ERROR_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #ifdef _WIN32 #include diff --git a/src/system/FileDescriptor.hxx b/src/system/FileDescriptor.hxx index a6e32b963..5e91bbd33 100644 --- a/src/system/FileDescriptor.hxx +++ b/src/system/FileDescriptor.hxx @@ -31,7 +31,7 @@ #define FILE_DESCRIPTOR_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/tag/Builder.hxx b/src/tag/Builder.hxx index f0d37990b..136e0e745 100644 --- a/src/tag/Builder.hxx +++ b/src/tag/Builder.hxx @@ -22,7 +22,7 @@ #include "Type.h" #include "Chrono.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/tag/FixString.hxx b/src/tag/FixString.hxx index 618d9640d..256d75008 100644 --- a/src/tag/FixString.hxx +++ b/src/tag/FixString.hxx @@ -21,7 +21,7 @@ #define MPD_TAG_STRING_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" struct StringView; template struct WritableBuffer; diff --git a/src/tag/Format.hxx b/src/tag/Format.hxx index 3cda2e4f9..25a678144 100644 --- a/src/tag/Format.hxx +++ b/src/tag/Format.hxx @@ -21,7 +21,7 @@ #define MPD_TAG_FORMAT_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" struct Tag; diff --git a/src/tag/Handler.hxx b/src/tag/Handler.hxx index 04c501101..45acbb6b3 100644 --- a/src/tag/Handler.hxx +++ b/src/tag/Handler.hxx @@ -23,7 +23,7 @@ #include "check.h" #include "Type.h" #include "Chrono.hxx" -#include "Compiler.h" +#include "util/Compiler.h" struct AudioFormat; class TagBuilder; diff --git a/src/tag/ParseName.hxx b/src/tag/ParseName.hxx index 541c0858c..1537bc453 100644 --- a/src/tag/ParseName.hxx +++ b/src/tag/ParseName.hxx @@ -21,7 +21,7 @@ #define MPD_TAG_PARSE_NAME_HXX #include "Type.h" -#include "Compiler.h" +#include "util/Compiler.h" /** * Parse the string, and convert it into a #TagType. Returns diff --git a/src/tag/Set.hxx b/src/tag/Set.hxx index 59a39d7f6..e74d145f4 100644 --- a/src/tag/Set.hxx +++ b/src/tag/Set.hxx @@ -20,7 +20,7 @@ #ifndef MPD_TAG_SET_HXX #define MPD_TAG_SET_HXX -#include "Compiler.h" +#include "util/Compiler.h" #include "Tag.hxx" #include diff --git a/src/tag/Settings.hxx b/src/tag/Settings.hxx index e3d4d3bac..5a690138e 100644 --- a/src/tag/Settings.hxx +++ b/src/tag/Settings.hxx @@ -22,7 +22,7 @@ #include "Mask.hxx" #include "Type.h" -#include "Compiler.h" +#include "util/Compiler.h" extern TagMask global_tag_mask; diff --git a/src/tag/Table.hxx b/src/tag/Table.hxx index f808a86ba..28714378a 100644 --- a/src/tag/Table.hxx +++ b/src/tag/Table.hxx @@ -21,7 +21,7 @@ #define MPD_TAG_TABLE_HXX #include "Type.h" -#include "Compiler.h" +#include "util/Compiler.h" struct tag_table { const char *name; diff --git a/src/tag/Tag.hxx b/src/tag/Tag.hxx index 4a12dde16..842ea5873 100644 --- a/src/tag/Tag.hxx +++ b/src/tag/Tag.hxx @@ -23,7 +23,7 @@ #include "Type.h" // IWYU pragma: export #include "Item.hxx" // IWYU pragma: export #include "Chrono.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include #include diff --git a/src/tag/VorbisComment.hxx b/src/tag/VorbisComment.hxx index d2ea86338..99da9b534 100644 --- a/src/tag/VorbisComment.hxx +++ b/src/tag/VorbisComment.hxx @@ -21,7 +21,7 @@ #define MPD_TAG_VORBIS_COMMENT_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" /** * Checks if the specified name matches the entry's name, and if yes, diff --git a/src/thread/Id.hxx b/src/thread/Id.hxx index 7fc6a4d80..1dc77a2e3 100644 --- a/src/thread/Id.hxx +++ b/src/thread/Id.hxx @@ -20,7 +20,7 @@ #ifndef MPD_THREAD_ID_HXX #define MPD_THREAD_ID_HXX -#include "Compiler.h" +#include "util/Compiler.h" #ifdef _WIN32 #include diff --git a/src/thread/Thread.hxx b/src/thread/Thread.hxx index 822943ac3..7f724a627 100644 --- a/src/thread/Thread.hxx +++ b/src/thread/Thread.hxx @@ -22,7 +22,7 @@ #include "check.h" #include "util/BindMethod.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #ifdef _WIN32 #include diff --git a/src/util/Compiler.h b/src/util/Compiler.h new file mode 100644 index 000000000..d2ca0b8f3 --- /dev/null +++ b/src/util/Compiler.h @@ -0,0 +1,186 @@ +/* + * Copyright 2003-2017 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 COMPILER_H +#define COMPILER_H + +#define GCC_MAKE_VERSION(major, minor, patchlevel) ((major) * 10000 + (minor) * 100 + patchlevel) + +#ifdef __GNUC__ +#define GCC_VERSION GCC_MAKE_VERSION(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) +#else +#define GCC_VERSION 0 +#endif + +#ifdef __clang__ +# define CLANG_VERSION GCC_MAKE_VERSION(__clang_major__, __clang_minor__, __clang_patchlevel__) +#elif defined(__GNUC__) +# define CLANG_VERSION 0 +#endif + +/** + * Are we building with the specified version of gcc (not clang or any + * other compiler) or newer? + */ +#define GCC_CHECK_VERSION(major, minor) \ + (CLANG_VERSION == 0 && \ + GCC_VERSION >= GCC_MAKE_VERSION(major, minor, 0)) + +/** + * Are we building with clang (any version) or at least the specified + * gcc version? + */ +#define CLANG_OR_GCC_VERSION(major, minor) \ + (CLANG_VERSION > 0 || GCC_CHECK_VERSION(major, minor)) + +/** + * Are we building with gcc (not clang or any other compiler) and a + * version older than the specified one? + */ +#define GCC_OLDER_THAN(major, minor) \ + (GCC_VERSION > 0 && CLANG_VERSION == 0 && \ + GCC_VERSION < GCC_MAKE_VERSION(major, minor, 0)) + +#ifdef __clang__ +# if __clang_major__ < 3 +# error Sorry, your clang version is too old. You need at least version 3.1. +# endif +#elif defined(__GNUC__) +# if GCC_OLDER_THAN(6,0) +# error Sorry, your gcc version is too old. You need at least version 6.0. +# endif +#else +# warning Untested compiler. Use at your own risk! +#endif + +/** + * Are we building with the specified version of clang or newer? + */ +#define CLANG_CHECK_VERSION(major, minor) \ + (CLANG_VERSION >= GCC_MAKE_VERSION(major, minor, 0)) + +#if CLANG_OR_GCC_VERSION(4,0) + +/* GCC 4.x */ + +#define gcc_const __attribute__((const)) +#define gcc_deprecated __attribute__((deprecated)) +#define gcc_may_alias __attribute__((may_alias)) +#define gcc_malloc __attribute__((malloc)) +#define gcc_noreturn __attribute__((noreturn)) +#define gcc_packed __attribute__((packed)) +#define gcc_printf(a,b) __attribute__((format(printf, a, b))) +#define gcc_pure __attribute__((pure)) +#define gcc_sentinel __attribute__((sentinel)) +#define gcc_unused __attribute__((unused)) +#define gcc_warn_unused_result __attribute__((warn_unused_result)) + +#define gcc_nonnull(...) __attribute__((nonnull(__VA_ARGS__))) +#define gcc_nonnull_all __attribute__((nonnull)) +#define gcc_returns_nonnull __attribute__((returns_nonnull)) +#define gcc_returns_twice __attribute__((returns_twice)) + +#define gcc_likely(x) __builtin_expect (!!(x), 1) +#define gcc_unlikely(x) __builtin_expect (!!(x), 0) + +#define gcc_visibility_hidden __attribute__((visibility("hidden"))) +#define gcc_visibility_default __attribute__((visibility("default"))) + +#define gcc_noinline __attribute__((noinline)) +#define gcc_always_inline __attribute__((always_inline)) + +#else + +/* generic C compiler */ + +#define gcc_const +#define gcc_deprecated +#define gcc_may_alias +#define gcc_malloc +#define gcc_noreturn +#define gcc_packed +#define gcc_printf(a,b) +#define gcc_pure +#define gcc_sentinel +#define gcc_unused +#define gcc_warn_unused_result + +#define gcc_nonnull(...) +#define gcc_nonnull_all +#define gcc_returns_nonnull +#define gcc_returns_twice + +#define gcc_likely(x) (x) +#define gcc_unlikely(x) (x) + +#define gcc_visibility_hidden +#define gcc_visibility_default + +#define gcc_noinline +#define gcc_always_inline inline + +#endif + +#if CLANG_OR_GCC_VERSION(4,3) + +#define gcc_hot __attribute__((hot)) +#define gcc_cold __attribute__((cold)) + +#else /* ! GCC_UNUSED >= 40300 */ + +#define gcc_hot +#define gcc_cold + +#endif /* ! GCC_UNUSED >= 40300 */ + +#if GCC_CHECK_VERSION(4,6) +#define gcc_flatten __attribute__((flatten)) +#else +#define gcc_flatten +#endif + +#ifndef __cplusplus +/* plain C99 has "restrict" */ +#define gcc_restrict restrict +#elif CLANG_OR_GCC_VERSION(4,0) +/* "__restrict__" is a GCC extension for C++ */ +#define gcc_restrict __restrict__ +#else +/* disable it on other compilers */ +#define gcc_restrict +#endif + +#ifndef __has_feature + // define dummy macro for non-clang compilers + #define __has_feature(x) 0 +#endif + +#if __has_feature(attribute_unused_on_fields) +#define gcc_unused_field gcc_unused +#else +#define gcc_unused_field +#endif + +#if defined(__GNUC__) || defined(__clang__) +#define gcc_unreachable() __builtin_unreachable() +#else +#define gcc_unreachable() +#endif + +#endif diff --git a/src/win32/Win32Main.cxx b/src/win32/Win32Main.cxx index 6475509b0..f1c22f59f 100644 --- a/src/win32/Win32Main.cxx +++ b/src/win32/Win32Main.cxx @@ -22,7 +22,7 @@ #ifdef _WIN32 -#include "Compiler.h" +#include "util/Compiler.h" #include "Instance.hxx" #include "system/FatalError.hxx" diff --git a/src/zeroconf/AvahiPoll.hxx b/src/zeroconf/AvahiPoll.hxx index d1a13c130..83bae006d 100644 --- a/src/zeroconf/AvahiPoll.hxx +++ b/src/zeroconf/AvahiPoll.hxx @@ -21,7 +21,7 @@ #define MPD_AVAHI_POLL_HXX #include "check.h" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/zeroconf/ZeroconfBonjour.cxx b/src/zeroconf/ZeroconfBonjour.cxx index 9125bf483..ebf636363 100644 --- a/src/zeroconf/ZeroconfBonjour.cxx +++ b/src/zeroconf/ZeroconfBonjour.cxx @@ -24,7 +24,7 @@ #include "event/SocketMonitor.hxx" #include "util/Domain.hxx" #include "Log.hxx" -#include "Compiler.h" +#include "util/Compiler.h" #include diff --git a/src/zeroconf/ZeroconfGlue.cxx b/src/zeroconf/ZeroconfGlue.cxx index e3ecb8eba..21b9403d0 100644 --- a/src/zeroconf/ZeroconfGlue.cxx +++ b/src/zeroconf/ZeroconfGlue.cxx @@ -26,7 +26,7 @@ #include "Listen.hxx" #include "util/Domain.hxx" #include "Log.hxx" -#include "Compiler.h" +#include "util/Compiler.h" static constexpr Domain zeroconf_domain("zeroconf"); -- cgit v1.2.3