diff options
43 files changed, 69 insertions, 67 deletions
diff --git a/Makefile.am b/Makefile.am index b21761092..8b5f7cc9a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,6 +9,7 @@ bin_PROGRAMS = src/mpd noinst_LIBRARIES = \ libutil.a \ + libsystem.a \ libevent.a \ libpcm.a \ libconf.a \ @@ -43,6 +44,7 @@ src_mpd_LDADD = \ $(MIXER_LIBS) \ libconf.a \ libevent.a \ + libsystem.a \ libutil.a \ libfs.a \ $(SYSTEMD_DAEMON_LIBS) \ @@ -54,7 +56,6 @@ mpd_headers = \ src/filter_internal.h \ src/command.h \ src/conf.h \ - src/fd_util.h \ src/gerror.h \ src/glib_compat.h \ src/gcc.h \ @@ -91,8 +92,6 @@ src_mpd_SOURCES = \ src/thread/PosixCond.hxx \ src/thread/WindowsCond.hxx \ src/thread/GLibCond.hxx \ - src/FatalError.cxx src/FatalError.hxx \ - src/clock.c src/clock.h \ src/notify.cxx src/notify.hxx \ src/AudioConfig.cxx src/AudioConfig.hxx \ src/CheckAudioFormat.cxx src/CheckAudioFormat.hxx \ @@ -135,7 +134,6 @@ src_mpd_SOURCES = \ src/DatabaseVisitor.hxx \ src/DatabaseSelection.cxx src/DatabaseSelection.hxx \ src/ExcludeList.cxx src/ExcludeList.hxx \ - src/fd_util.c \ src/FilterConfig.cxx src/FilterConfig.hxx \ src/FilterPlugin.cxx src/FilterPlugin.hxx \ src/FilterRegistry.cxx src/FilterRegistry.hxx \ @@ -166,7 +164,6 @@ src_mpd_SOURCES = \ src/Listen.cxx src/Listen.hxx \ src/Log.cxx src/Log.hxx \ src/ls.cxx \ - src/SocketError.hxx \ src/io_error.h \ src/IOThread.cxx src/IOThread.hxx \ src/Main.cxx src/Main.hxx \ @@ -210,8 +207,6 @@ src_mpd_SOURCES = \ src/SongPrint.cxx src/SongPrint.hxx \ src/SongSave.cxx src/SongSave.hxx \ src/SongSort.cxx src/SongSort.hxx \ - src/resolver.c src/resolver.h \ - src/SocketUtil.cxx src/SocketUtil.hxx \ src/StateFile.cxx src/StateFile.hxx \ src/Stats.cxx \ src/TagType.h \ @@ -285,6 +280,16 @@ libutil_a_SOURCES = \ src/util/byte_reverse.c src/util/byte_reverse.h \ src/util/bit_reverse.c src/util/bit_reverse.h +# System library + +libsystem_a_SOURCES = \ + src/system/FatalError.cxx src/system/FatalError.hxx \ + src/system/fd_util.c src/system/fd_util.h \ + src/system/SocketUtil.cxx src/system/SocketUtil.hxx \ + src/system/SocketError.hxx \ + src/system/resolver.c src/system/resolver.h \ + src/system/clock.c src/system/clock.h + # Event loop library libevent_a_SOURCES = \ @@ -1057,9 +1062,9 @@ test_read_conf_LDADD = \ test_read_conf_SOURCES = test/read_conf.cxx test_run_resolver_LDADD = \ + libsystem.a \ $(GLIB_LIBS) -test_run_resolver_SOURCES = test/run_resolver.c \ - src/resolver.c +test_run_resolver_SOURCES = test/run_resolver.c test_DumpDatabase_LDADD = \ $(DB_LIBS) \ @@ -1084,13 +1089,13 @@ test_run_input_LDADD = \ libconf.a \ libutil.a \ libevent.a \ + libsystem.a \ libfs.a \ $(GLIB_LIBS) test_run_input_SOURCES = test/run_input.cxx \ test/stdbin.h \ src/IOThread.cxx \ - src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx \ - src/fd_util.c + src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx if ENABLE_ARCHIVE @@ -1100,13 +1105,13 @@ test_visit_archive_LDADD = \ libconf.a \ libutil.a \ libevent.a \ + libsystem.a \ libfs.a \ $(GLIB_LIBS) test_visit_archive_SOURCES = test/visit_archive.cxx \ src/IOThread.cxx \ src/InputStream.cxx \ - src/Tag.cxx src/TagNames.c src/TagPool.cxx \ - src/fd_util.c + src/Tag.cxx src/TagNames.c src/TagPool.cxx if ENABLE_DESPOTIFY test_visit_archive_SOURCES += src/DespotifyUtils.cxx @@ -1120,14 +1125,14 @@ test_dump_text_file_LDADD = \ libconf.a \ libevent.a \ libfs.a \ + libsystem.a \ libutil.a \ $(GLIB_LIBS) test_dump_text_file_SOURCES = test/dump_text_file.cxx \ test/stdbin.h \ src/IOThread.cxx \ src/Tag.cxx src/TagNames.c src/TagPool.cxx \ - src/TextInputStream.cxx \ - src/fd_util.c + src/TextInputStream.cxx test_dump_playlist_LDADD = \ $(PLAYLIST_LIBS) \ @@ -1138,6 +1143,7 @@ test_dump_playlist_LDADD = \ $(TAG_LIBS) \ libconf.a \ libevent.a \ + libsystem.a \ libfs.a \ libutil.a \ libpcm.a \ @@ -1149,8 +1155,7 @@ test_dump_playlist_SOURCES = test/dump_playlist.cxx \ src/TagHandler.cxx src/TagFile.cxx \ src/CheckAudioFormat.cxx \ src/TextInputStream.cxx \ - src/cue/CueParser.cxx src/cue/CueParser.hxx \ - src/fd_util.c + src/cue/CueParser.cxx src/cue/CueParser.hxx if HAVE_FLAC test_dump_playlist_SOURCES += \ @@ -1166,6 +1171,7 @@ test_run_decoder_LDADD = \ $(TAG_LIBS) \ libconf.a \ libevent.a \ + libsystem.a \ libfs.a \ libutil.a \ $(GLIB_LIBS) @@ -1174,7 +1180,6 @@ test_run_decoder_SOURCES = test/run_decoder.cxx \ src/IOThread.cxx \ src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagHandler.cxx \ src/ReplayGainInfo.cxx \ - src/fd_util.c \ src/AudioFormat.cxx src/CheckAudioFormat.cxx \ $(ARCHIVE_SRC) \ $(INPUT_SRC) \ @@ -1189,6 +1194,7 @@ test_read_tags_LDADD = \ $(TAG_LIBS) \ libconf.a \ libevent.a \ + libsystem.a \ libfs.a \ libutil.a \ $(GLIB_LIBS) @@ -1196,7 +1202,6 @@ test_read_tags_SOURCES = test/read_tags.cxx \ src/IOThread.cxx \ src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagHandler.cxx \ src/ReplayGainInfo.cxx \ - src/fd_util.c \ src/CheckAudioFormat.cxx \ $(DECODER_SRC) @@ -1307,6 +1312,7 @@ test_run_output_LDADD = $(MPD_LIBS) \ libconf.a \ libevent.a \ libfs.a \ + libsystem.a \ libutil.a \ $(GLIB_LIBS) test_run_output_SOURCES = test/run_output.cxx \ @@ -1316,11 +1322,9 @@ test_run_output_SOURCES = test/run_output.cxx \ src/CheckAudioFormat.cxx \ src/AudioFormat.cxx \ src/AudioParser.cxx \ - src/Timer.cxx src/clock.c \ + src/Timer.cxx \ src/Tag.cxx src/TagNames.c src/TagPool.cxx \ src/Page.cxx \ - src/SocketUtil.cxx \ - src/resolver.c \ src/OutputInit.cxx src/OutputFinish.cxx src/OutputList.cxx \ src/OutputPlugin.cxx \ src/MixerControl.cxx \ @@ -1328,8 +1332,7 @@ test_run_output_SOURCES = test/run_output.cxx \ src/FilterPlugin.cxx \ src/FilterConfig.cxx \ src/AudioCompress/compress.c \ - src/ReplayGainInfo.cxx \ - src/fd_util.c + src/ReplayGainInfo.cxx test_read_mixer_LDADD = \ libpcm.a \ @@ -1338,13 +1341,13 @@ test_read_mixer_LDADD = \ libconf.a \ libutil.a \ libevent.a \ + libsystem.a \ libfs.a \ $(GLIB_LIBS) test_read_mixer_SOURCES = test/read_mixer.cxx \ src/MixerControl.cxx \ src/FilterPlugin.cxx \ - src/filter/VolumeFilterPlugin.cxx \ - src/fd_util.c + src/filter/VolumeFilterPlugin.cxx if ENABLE_BZIP2_TEST TESTS += test/test_archive_bzip2.sh @@ -1361,11 +1364,10 @@ endif if ENABLE_INOTIFY noinst_PROGRAMS += test/run_inotify test_run_inotify_SOURCES = test/run_inotify.cxx \ - src/FatalError.cxx \ - src/fd_util.c \ src/InotifySource.cxx test_run_inotify_LDADD = \ libevent.a \ + libsystem.a \ libutil.a \ $(GLIB_LIBS) endif @@ -1393,9 +1395,9 @@ test_test_pcm_LDADD = \ test_test_queue_priority_SOURCES = \ src/Queue.cxx \ - src/fd_util.c \ test/test_queue_priority.cxx test_test_queue_priority_LDADD = \ + libsystem.a \ libutil.a \ $(GLIB_LIBS) diff --git a/src/ClientNew.cxx b/src/ClientNew.cxx index 22127c491..c277423ab 100644 --- a/src/ClientNew.cxx +++ b/src/ClientNew.cxx @@ -22,9 +22,9 @@ #include "ClientList.hxx" #include "Partition.hxx" #include "Instance.hxx" -#include "fd_util.h" +#include "system/fd_util.h" extern "C" { -#include "resolver.h" +#include "system/resolver.h" } #include "Permission.hxx" diff --git a/src/Daemon.cxx b/src/Daemon.cxx index 84e32d43a..e0990d146 100644 --- a/src/Daemon.cxx +++ b/src/Daemon.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "Daemon.hxx" -#include "FatalError.hxx" +#include "system/FatalError.hxx" #include <glib.h> diff --git a/src/Daemon.hxx b/src/Daemon.hxx index cd4cc965e..6c27ebc3e 100644 --- a/src/Daemon.hxx +++ b/src/Daemon.hxx @@ -46,7 +46,7 @@ daemonize_finish(void) void daemonize_kill(void); #else -#include "FatalError.hxx" +#include "system/FatalError.hxx" static inline void daemonize_kill(void) { diff --git a/src/DecoderThread.cxx b/src/DecoderThread.cxx index 61c1fdd8a..8c196cdae 100644 --- a/src/DecoderThread.cxx +++ b/src/DecoderThread.cxx @@ -24,7 +24,7 @@ #include "DecoderError.hxx" #include "DecoderPlugin.hxx" #include "Song.hxx" -#include "FatalError.hxx" +#include "system/FatalError.hxx" #include "Mapper.hxx" #include "fs/Path.hxx" #include "DecoderAPI.hxx" diff --git a/src/InotifySource.cxx b/src/InotifySource.cxx index ff161b6c6..9a2d4d46d 100644 --- a/src/InotifySource.cxx +++ b/src/InotifySource.cxx @@ -20,8 +20,8 @@ #include "config.h" #include "InotifySource.hxx" #include "util/fifo_buffer.h" -#include "fd_util.h" -#include "FatalError.hxx" +#include "system/fd_util.h" +#include "system/FatalError.hxx" #include <glib.h> diff --git a/src/Log.cxx b/src/Log.cxx index 37bff9c78..52b8be3ba 100644 --- a/src/Log.cxx +++ b/src/Log.cxx @@ -20,8 +20,8 @@ #include "config.h" #include "Log.hxx" #include "conf.h" -#include "fd_util.h" -#include "FatalError.hxx" +#include "system/fd_util.h" +#include "system/FatalError.hxx" #include "mpd_error.h" #include <assert.h> diff --git a/src/Main.cxx b/src/Main.cxx index 4efe59325..cbf501267 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -55,7 +55,7 @@ #include "AudioConfig.hxx" #include "pcm/PcmResample.hxx" #include "Daemon.hxx" -#include "FatalError.hxx" +#include "system/FatalError.hxx" extern "C" { #include "stats.h" diff --git a/src/MusicBuffer.cxx b/src/MusicBuffer.cxx index 049fb81d9..eb42a0311 100644 --- a/src/MusicBuffer.cxx +++ b/src/MusicBuffer.cxx @@ -22,7 +22,7 @@ #include "MusicChunk.hxx" #include "thread/Mutex.hxx" #include "util/SliceBuffer.hxx" -#include "FatalError.hxx" +#include "system/FatalError.hxx" #include <assert.h> diff --git a/src/OutputAll.cxx b/src/OutputAll.cxx index c58f54597..575eb0c70 100644 --- a/src/OutputAll.cxx +++ b/src/OutputAll.cxx @@ -26,7 +26,7 @@ #include "MusicBuffer.hxx" #include "MusicPipe.hxx" #include "MusicChunk.hxx" -#include "FatalError.hxx" +#include "system/FatalError.hxx" #include "conf.h" #include "notify.hxx" diff --git a/src/OutputThread.cxx b/src/OutputThread.cxx index 081b89f35..68c5c2c7b 100644 --- a/src/OutputThread.cxx +++ b/src/OutputThread.cxx @@ -29,7 +29,7 @@ #include "PlayerControl.hxx" #include "MusicPipe.hxx" #include "MusicChunk.hxx" -#include "FatalError.hxx" +#include "system/FatalError.hxx" #include "gcc.h" #include <glib.h> diff --git a/src/PlayerThread.cxx b/src/PlayerThread.cxx index 948ad9b90..87b173245 100644 --- a/src/PlayerThread.cxx +++ b/src/PlayerThread.cxx @@ -26,7 +26,7 @@ #include "MusicChunk.hxx" #include "Song.hxx" #include "Main.hxx" -#include "FatalError.hxx" +#include "system/FatalError.hxx" #include "CrossFade.hxx" #include "PlayerControl.hxx" #include "OutputAll.hxx" diff --git a/src/SignalHandlers.cxx b/src/SignalHandlers.cxx index 36408dc78..ef6be448b 100644 --- a/src/SignalHandlers.cxx +++ b/src/SignalHandlers.cxx @@ -26,7 +26,7 @@ #include "Main.hxx" #include "event/Loop.hxx" #include "GlobalEvents.hxx" -#include "FatalError.hxx" +#include "system/FatalError.hxx" #include <glib.h> diff --git a/src/Timer.cxx b/src/Timer.cxx index 18ccffbcb..75fba03aa 100644 --- a/src/Timer.cxx +++ b/src/Timer.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "Timer.hxx" #include "AudioFormat.hxx" -#include "clock.h" +#include "system/clock.h" #include <glib.h> diff --git a/src/UpdateGlue.cxx b/src/UpdateGlue.cxx index 08ba9783f..da8f92739 100644 --- a/src/UpdateGlue.cxx +++ b/src/UpdateGlue.cxx @@ -33,7 +33,7 @@ extern "C" { #include "Main.hxx" #include "Instance.hxx" -#include "FatalError.hxx" +#include "system/FatalError.hxx" #include <glib.h> diff --git a/src/event/BufferedSocket.cxx b/src/event/BufferedSocket.cxx index 05e703441..ac3d2cf0e 100644 --- a/src/event/BufferedSocket.cxx +++ b/src/event/BufferedSocket.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "BufferedSocket.hxx" -#include "SocketError.hxx" +#include "system/SocketError.hxx" #include "util/fifo_buffer.h" #include <assert.h> diff --git a/src/event/EventFD.cxx b/src/event/EventFD.cxx index f103c44b8..dba80d9be 100644 --- a/src/event/EventFD.cxx +++ b/src/event/EventFD.cxx @@ -20,7 +20,7 @@ #include "config.h" #ifdef USE_EVENTFD #include "EventFD.hxx" -#include "fd_util.h" +#include "system/fd_util.h" #include "gcc.h" #include <unistd.h> diff --git a/src/event/EventPipe.cxx b/src/event/EventPipe.cxx index 0a37abe03..3b52118e4 100644 --- a/src/event/EventPipe.cxx +++ b/src/event/EventPipe.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "EventPipe.hxx" -#include "fd_util.h" +#include "system/fd_util.h" #include "gcc.h" #include <unistd.h> diff --git a/src/event/FullyBufferedSocket.cxx b/src/event/FullyBufferedSocket.cxx index a92cb68aa..f8b149500 100644 --- a/src/event/FullyBufferedSocket.cxx +++ b/src/event/FullyBufferedSocket.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "FullyBufferedSocket.hxx" -#include "SocketError.hxx" +#include "system/SocketError.hxx" #include "util/fifo_buffer.h" #include <assert.h> diff --git a/src/event/MultiSocketMonitor.cxx b/src/event/MultiSocketMonitor.cxx index 6f20b907c..d8a9ffd6a 100644 --- a/src/event/MultiSocketMonitor.cxx +++ b/src/event/MultiSocketMonitor.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "MultiSocketMonitor.hxx" #include "Loop.hxx" -#include "fd_util.h" +#include "system/fd_util.h" #include "gcc.h" #include <assert.h> diff --git a/src/event/ServerSocket.cxx b/src/event/ServerSocket.cxx index 119bfe1d7..a137e2d9a 100644 --- a/src/event/ServerSocket.cxx +++ b/src/event/ServerSocket.cxx @@ -24,11 +24,11 @@ #endif #include "ServerSocket.hxx" -#include "SocketUtil.hxx" -#include "SocketError.hxx" +#include "system/SocketUtil.hxx" +#include "system/SocketError.hxx" #include "event/SocketMonitor.hxx" -#include "resolver.h" -#include "fd_util.h" +#include "system/resolver.h" +#include "system/fd_util.h" #include <sys/types.h> #include <sys/stat.h> diff --git a/src/event/SocketMonitor.cxx b/src/event/SocketMonitor.cxx index 6efa69647..92aac9a92 100644 --- a/src/event/SocketMonitor.cxx +++ b/src/event/SocketMonitor.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "SocketMonitor.hxx" #include "Loop.hxx" -#include "fd_util.h" +#include "system/fd_util.h" #include "gcc.h" #include <assert.h> diff --git a/src/fs/FileSystem.hxx b/src/fs/FileSystem.hxx index 2e1701c87..4df415e0a 100644 --- a/src/fs/FileSystem.hxx +++ b/src/fs/FileSystem.hxx @@ -21,7 +21,7 @@ #define MPD_FS_FILESYSTEM_HXX #include "check.h" -#include "fd_util.h" +#include "system/fd_util.h" #include "Path.hxx" diff --git a/src/input/FileInputPlugin.cxx b/src/input/FileInputPlugin.cxx index 2eecf32b6..6fd743179 100644 --- a/src/input/FileInputPlugin.cxx +++ b/src/input/FileInputPlugin.cxx @@ -22,7 +22,7 @@ #include "InputInternal.hxx" #include "InputStream.hxx" #include "InputPlugin.hxx" -#include "fd_util.h" +#include "system/fd_util.h" #include "open.h" #include "io_error.h" diff --git a/src/mixer/OssMixerPlugin.cxx b/src/mixer/OssMixerPlugin.cxx index d8af6dff0..231f38432 100644 --- a/src/mixer/OssMixerPlugin.cxx +++ b/src/mixer/OssMixerPlugin.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "MixerInternal.hxx" #include "OutputAPI.hxx" -#include "fd_util.h" +#include "system/fd_util.h" #include <glib.h> diff --git a/src/output/FifoOutputPlugin.cxx b/src/output/FifoOutputPlugin.cxx index a3c76aa4d..4d1b56e69 100644 --- a/src/output/FifoOutputPlugin.cxx +++ b/src/output/FifoOutputPlugin.cxx @@ -21,7 +21,7 @@ #include "FifoOutputPlugin.hxx" #include "OutputAPI.hxx" #include "Timer.hxx" -#include "fd_util.h" +#include "system/fd_util.h" #include "open.h" #include <glib.h> diff --git a/src/output/HttpdClient.cxx b/src/output/HttpdClient.cxx index 0a00ee2f9..c097e48f1 100644 --- a/src/output/HttpdClient.cxx +++ b/src/output/HttpdClient.cxx @@ -23,7 +23,7 @@ #include "util/fifo_buffer.h" #include "Page.hxx" #include "IcyMetaDataServer.hxx" -#include "SocketError.hxx" +#include "system/SocketError.hxx" #include <assert.h> #include <string.h> diff --git a/src/output/HttpdOutputPlugin.cxx b/src/output/HttpdOutputPlugin.cxx index 4169aabfa..fbf25ca00 100644 --- a/src/output/HttpdOutputPlugin.cxx +++ b/src/output/HttpdOutputPlugin.cxx @@ -24,10 +24,10 @@ #include "OutputAPI.hxx" #include "EncoderPlugin.hxx" #include "EncoderList.hxx" -#include "resolver.h" +#include "system/resolver.h" #include "Page.hxx" #include "IcyMetaDataServer.hxx" -#include "fd_util.h" +#include "system/fd_util.h" #include "Main.hxx" #include <assert.h> diff --git a/src/output/OssOutputPlugin.cxx b/src/output/OssOutputPlugin.cxx index 6362a374f..b31db6c43 100644 --- a/src/output/OssOutputPlugin.cxx +++ b/src/output/OssOutputPlugin.cxx @@ -21,7 +21,7 @@ #include "OssOutputPlugin.hxx" #include "OutputAPI.hxx" #include "MixerList.hxx" -#include "fd_util.h" +#include "system/fd_util.h" #include <glib.h> diff --git a/src/output/RecorderOutputPlugin.cxx b/src/output/RecorderOutputPlugin.cxx index afae17e84..9374e4c20 100644 --- a/src/output/RecorderOutputPlugin.cxx +++ b/src/output/RecorderOutputPlugin.cxx @@ -22,7 +22,7 @@ #include "OutputAPI.hxx" #include "EncoderPlugin.hxx" #include "EncoderList.hxx" -#include "fd_util.h" +#include "system/fd_util.h" #include "open.h" #include <assert.h> diff --git a/src/output/SolarisOutputPlugin.cxx b/src/output/SolarisOutputPlugin.cxx index 074eae728..aa2f853e6 100644 --- a/src/output/SolarisOutputPlugin.cxx +++ b/src/output/SolarisOutputPlugin.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "SolarisOutputPlugin.hxx" #include "OutputAPI.hxx" -#include "fd_util.h" +#include "system/fd_util.h" #include <glib.h> diff --git a/src/FatalError.cxx b/src/system/FatalError.cxx index 30ddc50ea..30ddc50ea 100644 --- a/src/FatalError.cxx +++ b/src/system/FatalError.cxx diff --git a/src/FatalError.hxx b/src/system/FatalError.hxx index 3918e5fc1..3918e5fc1 100644 --- a/src/FatalError.hxx +++ b/src/system/FatalError.hxx diff --git a/src/SocketError.hxx b/src/system/SocketError.hxx index 53a0c1d8f..53a0c1d8f 100644 --- a/src/SocketError.hxx +++ b/src/system/SocketError.hxx diff --git a/src/SocketUtil.cxx b/src/system/SocketUtil.cxx index dd7eb7dd2..dd7eb7dd2 100644 --- a/src/SocketUtil.cxx +++ b/src/system/SocketUtil.cxx diff --git a/src/SocketUtil.hxx b/src/system/SocketUtil.hxx index 3d0be78c4..3d0be78c4 100644 --- a/src/SocketUtil.hxx +++ b/src/system/SocketUtil.hxx diff --git a/src/clock.c b/src/system/clock.c index d987aed48..d987aed48 100644 --- a/src/clock.c +++ b/src/system/clock.c diff --git a/src/clock.h b/src/system/clock.h index c98b9a652..c98b9a652 100644 --- a/src/clock.h +++ b/src/system/clock.h diff --git a/src/fd_util.c b/src/system/fd_util.c index 17976a5ee..17976a5ee 100644 --- a/src/fd_util.c +++ b/src/system/fd_util.c diff --git a/src/fd_util.h b/src/system/fd_util.h index 9003b1616..9003b1616 100644 --- a/src/fd_util.h +++ b/src/system/fd_util.h diff --git a/src/resolver.c b/src/system/resolver.c index 243b7cd02..243b7cd02 100644 --- a/src/resolver.c +++ b/src/system/resolver.c diff --git a/src/resolver.h b/src/system/resolver.h index af14f5f23..af14f5f23 100644 --- a/src/resolver.h +++ b/src/system/resolver.h diff --git a/test/run_resolver.c b/test/run_resolver.c index ee0bc0172..87067ad23 100644 --- a/test/run_resolver.c +++ b/test/run_resolver.c @@ -18,7 +18,7 @@ */ #include "config.h" -#include "resolver.h" +#include "system/resolver.h" #ifdef WIN32 #include <ws2tcpip.h> |