Compiler.h: move to util/

ec54754e · Max Kellermann · 0ebba73c · ec54754e · ec54754e · ec54754e
Commit ec54754e authored Aug 20, 2018 by Max Kellermann
202 changed files
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,7 +79,6 @@ libmpd_a_SOURCES = \
 	$(OUTPUT_API_SRC) \
 	$(MIXER_API_SRC) \
 	src/check.h \
-	src/Compiler.h \
 	src/open.h \
 	src/protocol/Ack.cxx src/protocol/Ack.hxx \
 	src/protocol/ArgParser.cxx src/protocol/ArgParser.hxx \
@@ -505,6 +504,7 @@ endif
 # Generic utility library

 libutil_a_SOURCES = \
+	src/Compiler.h \
 	src/util/Exception.cxx src/util/Exception.hxx \
 	src/util/RuntimeError.hxx \
 	src/util/Macros.hxx \

--- 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 <stdint.h>
 #include <stddef.h>

--- 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;

--- 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"

--- 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

--- 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 <exception>


--- a/src/Mapper.hxx
+++ b/src/Mapper.hxx
@@ -26,7 +26,7 @@

 #include <string>

-#include "Compiler.h"
+#include "util/Compiler.h"

 #define PLAYLIST_FILE_SUFFIX ".m3u"


--- 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 <string>


--- 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"

--- 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 <string>
 #include <memory>

--- 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;

--- 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 <stdint.h>


--- 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 <stdint.h>


--- 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 <cstddef>


--- 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 <string>
 #include <chrono>

--- 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 <jni.h>


--- 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 <boost/intrusive/link_mode.hpp>
 #include <boost/intrusive/list_hook.hpp>

--- 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 <string>


--- 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 <stddef.h>
 #include <stdarg.h>

--- 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;

--- 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;

--- 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 <string>
 #include <vector>

--- 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;


--- 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 */

--- 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 <string>


--- 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 <stdint.h>


--- 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;

--- 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 <assert.h>


--- 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;

--- 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;

--- 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 <chrono>


--- 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 <string>


--- 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 <string>
 #include <chrono>

--- 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 <list>


--- 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;


--- 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 <string>


--- 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"

--- 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"

--- 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 <cassert>


--- 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 <boost/intrusive/list.hpp>


--- 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 <string>
 #include <vector>

--- 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 <string>


--- 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;

--- 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"


--- 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;


--- 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;

--- 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 <string>
 #include <list>

--- 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 <forward_list>
 #include <string>

--- 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;

--- 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;

--- 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 <atomic>


--- 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 <stdint.h>


--- 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"


--- 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;

--- 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 <forward_list>


--- 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;

--- 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 <stdint.h>


--- 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 <exception>


--- 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 <assert.h>
 #include <stddef.h>

--- 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<uint8_t> buffer;

--- 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 <algorithm>


--- 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 <exception>


--- 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 <assert.h>
 #include <string.h>

--- 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"

--- 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 <forward_list>
 #include <iterator>

--- 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 <array>

--- 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;


--- 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 {

--- 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 <exception>


--- 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"


--- 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)

--- 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

--- 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 <string>

--- 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"


--- 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;


--- 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 <stddef.h>

--- 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 <stddef.h>

--- 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"

--- 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"

--- 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 <zlib.h>


--- 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 <zlib.h>


--- 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 <stdint.h>


--- 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 <stddef.h>


--- 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 <stdio.h>


--- 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;

--- 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 <exception>


--- 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 <memory>


--- 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 <string>
 #include <memory>

--- 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;

--- 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 <jni.h>


--- 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 <alsa/asoundlib.h>


--- 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 <stdint.h>


--- 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

--- 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 <dbus/dbus.h>


--- 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 <functional>


--- 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 <dbus/dbus.h>


--- 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 <expat.h>


--- 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 <libavutil/avutil.h>

--- 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 <gcrypt.h>


--- 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 <array>


--- a/src/lib/icu/CaseFold.hxx
+++ b/src/lib/icu/CaseFold.hxx
--- a/src/lib/icu/Collate.hxx
+++ b/src/lib/icu/Collate.hxx
--- a/src/lib/icu/Compare.hxx
+++ b/src/lib/icu/Compare.hxx
--- a/src/lib/icu/Converter.hxx
+++ b/src/lib/icu/Converter.hxx
--- a/src/lib/icu/Win32.hxx
+++ b/src/lib/icu/Win32.hxx
--- a/src/lib/nfs/Base.hxx
+++ b/src/lib/nfs/Base.hxx
--- a/src/lib/nfs/Cancellable.hxx
+++ b/src/lib/nfs/Cancellable.hxx
--- a/src/lib/nfs/FileReader.hxx
+++ b/src/lib/nfs/FileReader.hxx
--- a/src/lib/nfs/Glue.hxx
+++ b/src/lib/nfs/Glue.hxx
--- a/src/lib/nfs/Manager.hxx
+++ b/src/lib/nfs/Manager.hxx
--- a/src/lib/upnp/Action.hxx
+++ b/src/lib/upnp/Action.hxx
--- a/src/lib/upnp/Compat.hxx
+++ b/src/lib/upnp/Compat.hxx
--- a/src/lib/upnp/ContentDirectoryService.hxx
+++ b/src/lib/upnp/ContentDirectoryService.hxx
--- a/src/lib/upnp/Discovery.hxx
+++ b/src/lib/upnp/Discovery.hxx
--- a/src/lib/upnp/Util.hxx
+++ b/src/lib/upnp/Util.hxx
--- a/src/lib/xiph/FlacIOHandle.cxx
+++ b/src/lib/xiph/FlacIOHandle.cxx
--- a/src/lib/xiph/FlacIOHandle.hxx
+++ b/src/lib/xiph/FlacIOHandle.hxx
--- a/src/lib/xiph/FlacMetadataChain.hxx
+++ b/src/lib/xiph/FlacMetadataChain.hxx
--- a/src/lib/xiph/FlacMetadataIterator.hxx
+++ b/src/lib/xiph/FlacMetadataIterator.hxx
--- a/src/lib/xiph/OggSerial.cxx
+++ b/src/lib/xiph/OggSerial.cxx
--- a/src/ls.hxx
+++ b/src/ls.hxx
--- a/src/mixer/MixerInternal.hxx
+++ b/src/mixer/MixerInternal.hxx
--- a/src/mixer/MixerType.hxx
+++ b/src/mixer/MixerType.hxx
--- a/src/mixer/Volume.hxx
+++ b/src/mixer/Volume.hxx
--- a/src/mixer/plugins/HaikuMixerPlugin.cxx
+++ b/src/mixer/plugins/HaikuMixerPlugin.cxx
--- a/src/mixer/plugins/RoarMixerPlugin.cxx
+++ b/src/mixer/plugins/RoarMixerPlugin.cxx
--- a/src/neighbor/Glue.hxx
+++ b/src/neighbor/Glue.hxx
--- a/src/neighbor/Registry.hxx
+++ b/src/neighbor/Registry.hxx
--- a/src/net/AllocatedSocketAddress.hxx
+++ b/src/net/AllocatedSocketAddress.hxx
--- a/src/net/Resolver.hxx
+++ b/src/net/Resolver.hxx
--- a/src/net/SocketAddress.hxx
+++ b/src/net/SocketAddress.hxx
--- a/src/net/SocketError.hxx
+++ b/src/net/SocketError.hxx
--- a/src/net/StaticSocketAddress.hxx
+++ b/src/net/StaticSocketAddress.hxx
--- a/src/net/ToString.hxx
+++ b/src/net/ToString.hxx
--- a/src/output/Control.hxx
+++ b/src/output/Control.hxx
--- a/src/output/Interface.cxx
+++ b/src/output/Interface.cxx
--- a/src/output/MultipleOutputs.hxx
+++ b/src/output/MultipleOutputs.hxx
--- a/src/output/OutputPlugin.hxx
+++ b/src/output/OutputPlugin.hxx
--- a/src/output/SharedPipeConsumer.hxx
+++ b/src/output/SharedPipeConsumer.hxx
--- a/src/output/Source.hxx
+++ b/src/output/Source.hxx
--- a/src/output/plugins/WinmmOutputPlugin.hxx
+++ b/src/output/plugins/WinmmOutputPlugin.hxx
--- a/src/output/plugins/httpd/HttpdClient.hxx
+++ b/src/output/plugins/httpd/HttpdClient.hxx
--- a/src/output/plugins/httpd/HttpdInternal.hxx
+++ b/src/output/plugins/httpd/HttpdInternal.hxx
--- a/src/pcm/FallbackResampler.hxx
+++ b/src/pcm/FallbackResampler.hxx
--- a/src/pcm/Interleave.hxx
+++ b/src/pcm/Interleave.hxx
--- a/src/pcm/LibsamplerateResampler.hxx
+++ b/src/pcm/LibsamplerateResampler.hxx
--- a/src/pcm/PcmBuffer.hxx
+++ b/src/pcm/PcmBuffer.hxx
--- a/src/pcm/PcmMix.hxx
+++ b/src/pcm/PcmMix.hxx
--- a/src/pcm/PcmUtils.hxx
+++ b/src/pcm/PcmUtils.hxx
--- a/src/pcm/Resampler.hxx
+++ b/src/pcm/Resampler.hxx
--- a/src/pcm/SampleFormat.hxx
+++ b/src/pcm/SampleFormat.hxx
--- a/src/pcm/SoxrResampler.hxx
+++ b/src/pcm/SoxrResampler.hxx
--- a/src/player/CrossFade.hxx
+++ b/src/player/CrossFade.hxx
--- a/src/player/Outputs.hxx
+++ b/src/player/Outputs.hxx
--- a/src/playlist/MemorySongEnumerator.hxx
+++ b/src/playlist/MemorySongEnumerator.hxx
--- a/src/playlist/PlaylistRegistry.hxx
+++ b/src/playlist/PlaylistRegistry.hxx
--- a/src/playlist/PlaylistStream.hxx
+++ b/src/playlist/PlaylistStream.hxx
--- a/src/playlist/cue/CueParser.hxx
+++ b/src/playlist/cue/CueParser.hxx
--- a/src/queue/IdTable.hxx
+++ b/src/queue/IdTable.hxx
--- a/src/queue/Queue.hxx
+++ b/src/queue/Queue.hxx
--- a/src/song/AndSongFilter.hxx
+++ b/src/song/AndSongFilter.hxx
--- a/src/song/BaseSongFilter.hxx
+++ b/src/song/BaseSongFilter.hxx
--- a/src/song/DetachedSong.hxx
+++ b/src/song/DetachedSong.hxx
--- a/src/song/Filter.hxx
+++ b/src/song/Filter.hxx
--- a/src/song/ISongFilter.hxx
+++ b/src/song/ISongFilter.hxx
--- a/src/song/LightSong.hxx
+++ b/src/song/LightSong.hxx
--- a/src/song/StringFilter.hxx
+++ b/src/song/StringFilter.hxx
--- a/src/sticker/StickerDatabase.hxx
+++ b/src/sticker/StickerDatabase.hxx
--- a/src/storage/CompositeStorage.hxx
+++ b/src/storage/CompositeStorage.hxx
--- a/src/storage/Configured.hxx
+++ b/src/storage/Configured.hxx
--- a/src/storage/Registry.hxx
+++ b/src/storage/Registry.hxx
--- a/src/storage/StorageInterface.hxx
+++ b/src/storage/StorageInterface.hxx
--- a/src/storage/plugins/LocalStorage.hxx
+++ b/src/storage/plugins/LocalStorage.hxx
--- a/src/system/ByteOrder.hxx
+++ b/src/system/ByteOrder.hxx
--- a/src/system/Clock.hxx
+++ b/src/system/Clock.hxx
--- a/src/system/Error.hxx
+++ b/src/system/Error.hxx
--- a/src/system/EventFD.cxx
+++ b/src/system/EventFD.cxx
--- a/src/system/EventPipe.cxx
+++ b/src/system/EventPipe.cxx
--- a/src/system/FatalError.hxx
+++ b/src/system/FatalError.hxx
--- a/src/system/FileDescriptor.hxx
+++ b/src/system/FileDescriptor.hxx
--- a/src/tag/Builder.hxx
+++ b/src/tag/Builder.hxx
--- a/src/tag/FixString.hxx
+++ b/src/tag/FixString.hxx
--- a/src/tag/Format.hxx
+++ b/src/tag/Format.hxx
--- a/src/tag/Handler.hxx
+++ b/src/tag/Handler.hxx
--- a/src/tag/ParseName.hxx
+++ b/src/tag/ParseName.hxx
--- a/src/tag/Set.hxx
+++ b/src/tag/Set.hxx
--- a/src/tag/Settings.hxx
+++ b/src/tag/Settings.hxx
--- a/src/tag/Table.hxx
+++ b/src/tag/Table.hxx
--- a/src/tag/Tag.hxx
+++ b/src/tag/Tag.hxx
--- a/src/tag/VorbisComment.hxx
+++ b/src/tag/VorbisComment.hxx
--- a/src/thread/Id.hxx
+++ b/src/thread/Id.hxx
--- a/src/thread/Thread.hxx
+++ b/src/thread/Thread.hxx
--- a/src/Compiler.h
+++ b/src/Compiler.h
--- a/src/win32/Win32Main.cxx
+++ b/src/win32/Win32Main.cxx
--- a/src/zeroconf/AvahiPoll.hxx
+++ b/src/zeroconf/AvahiPoll.hxx
--- a/src/zeroconf/ZeroconfBonjour.cxx
+++ b/src/zeroconf/ZeroconfBonjour.cxx
--- a/src/zeroconf/ZeroconfGlue.cxx
+++ b/src/zeroconf/ZeroconfGlue.cxx
--- a/test/DumpDecoderClient.cxx
+++ b/test/DumpDecoderClient.cxx
--- a/test/test_archive.cxx
+++ b/test/test_archive.cxx
--- a/test/test_byte_reverse.cxx
+++ b/test/test_byte_reverse.cxx
--- a/test/test_pcm_main.cxx
+++ b/test/test_pcm_main.cxx
--- a/test/test_protocol.cxx
+++ b/test/test_protocol.cxx