diff options
| author | Max Kellermann <max@duempel.org> | 2009-11-12 09:12:38 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-11-12 09:17:03 +0100 |
| commit | 5b82ffc291c6b56ce85c139d48f4587d33b1f42c (patch) | |
| tree | 922232b6c03a6fc57be8cc12bc6b34b17296c3bd | |
| parent | 8068fd5228472387cc83b49ed4e9710f8452b865 (diff) | |
| download | mpd-5b82ffc291c6b56ce85c139d48f4587d33b1f42c.tar.gz mpd-5b82ffc291c6b56ce85c139d48f4587d33b1f42c.tar.xz mpd-5b82ffc291c6b56ce85c139d48f4587d33b1f42c.zip | |
include config.h in all sources
After we've been hit by Large File Support problems several times in
the past week (which only occur on 32 bit platforms, which I don't
have), this is yet another attempt to fix the issue.
Diffstat (limited to '')
212 files changed, 329 insertions, 65 deletions
diff --git a/Makefile.am b/Makefile.am index 587af393e..72e3a534a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,6 +29,7 @@ src_mpd_LDADD = $(MPD_LIBS) \ $(GLIB_LIBS) mpd_headers = \ + src/check.h \ src/notify.h \ src/ack.h \ src/audio.h \ diff --git a/configure.ac b/configure.ac index 2efff82a6..b9eb06d36 100644 --- a/configure.ac +++ b/configure.ac @@ -101,6 +101,9 @@ dnl libc features dnl AC_SYS_LARGEFILE +if test x$enable_largefile != xno; then + AC_DEFINE([ENABLE_LARGEFILE], 1, [Define if large file support is enabled]) +fi AC_CHECK_FUNCS(daemon fork syslog) if test $ac_cv_func_syslog = no; then diff --git a/scripts/check_config_h.rb b/scripts/check_config_h.rb new file mode 100755 index 000000000..2619984e4 --- /dev/null +++ b/scripts/check_config_h.rb @@ -0,0 +1,47 @@ +#!/usr/bin/env ruby +# +# This script verifies that every source includes config.h first. +# This is very important for consistent Large File Support. +# + +def check_file(file) + first = true + file.each_line do |line| + if line =~ /^\#include\s+(\S+)/ then + if $1 == '"config.h"' + unless first + puts "#{file.path}: config.h included too late" + end + else + if first + puts "#{file.path}: config.h missing" + end + end + first = false + end + end +end + +def check_path(path) + File.open(path) do |file| + check_file(file) + end +end + +if ARGV.empty? + Dir["src/*.c"].each do |path| + check_path(path) + end + + Dir["src/*/*.c"].each do |path| + check_path(path) + end + + Dir["test/*.c"].each do |path| + check_path(path) + end +else + ARGV.each do |path| + check_path(path) + end +end diff --git a/src/archive/bz2_plugin.c b/src/archive/bz2_plugin.c index 4db68f48e..e484ac8a6 100644 --- a/src/archive/bz2_plugin.c +++ b/src/archive/bz2_plugin.c @@ -21,9 +21,9 @@ * single bz2 archive handling (requires libbz2) */ +#include "config.h" #include "archive_api.h" #include "input_plugin.h" -#include "config.h" #include <stdint.h> #include <stddef.h> diff --git a/src/archive/iso_plugin.c b/src/archive/iso_plugin.c index d295f148f..04e0cfb3f 100644 --- a/src/archive/iso_plugin.c +++ b/src/archive/iso_plugin.c @@ -21,6 +21,7 @@ * iso archive handling (requires cdio, and iso9660) */ +#include "config.h" #include "archive_api.h" #include "input_plugin.h" diff --git a/src/archive/zip_plugin.c b/src/archive/zip_plugin.c index ad3b403b4..9078c2d32 100644 --- a/src/archive/zip_plugin.c +++ b/src/archive/zip_plugin.c @@ -21,6 +21,7 @@ * zip archive handling (requires zziplib) */ +#include "config.h" #include "archive_api.h" #include "archive_api.h" #include "input_plugin.h" diff --git a/src/archive_list.c b/src/archive_list.c index e71b3036a..9343e63b0 100644 --- a/src/archive_list.c +++ b/src/archive_list.c @@ -17,10 +17,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "archive_list.h" #include "archive_api.h" #include "utils.h" -#include "config.h" #include <string.h> #include <glib.h> diff --git a/src/audio.c b/src/audio.c index a0259cb37..1d234bf5b 100644 --- a/src/audio.c +++ b/src/audio.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "audio.h" #include "audio_format.h" #include "audio_parser.h" diff --git a/src/audio_parser.c b/src/audio_parser.c index 7c0d45ddc..5795c35dd 100644 --- a/src/audio_parser.c +++ b/src/audio_parser.c @@ -22,6 +22,7 @@ * */ +#include "config.h" #include "audio_parser.h" #include "audio_format.h" diff --git a/src/buffer.c b/src/buffer.c index 24715a744..898197492 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "buffer.h" #include "chunk.h" #include "poison.h" diff --git a/src/check.h b/src/check.h new file mode 100644 index 000000000..6fdb2535e --- /dev/null +++ b/src/check.h @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2003-2009 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPD_CHECK_H +#define MPD_CHECK_H + +/* + * All sources must include config.h on the first line to ensure that + * Large File Support is configured properly. This header checks + * whether this has happened. + * + * Usage: include this header before you use any of the above types. + * It will stop the compiler if something went wrong. + * + * This is Linux/glibc specific, and only enabled in the debug build, + * so bugs in this headers don't affect users with production builds. + * + */ + +#ifndef PACKAGE_VERSION +#error config.h missing +#endif + +#if defined(__linux__) && !defined(NDEBUG) && defined(ENABLE_LARGEFILE) && \ + defined(_FEATURES_H) && defined(__i386__) && \ + !defined(__USE_FILE_OFFSET64) +/* on i386, check if LFS is enabled */ +#error config.h was included too late +#endif + +#endif diff --git a/src/chunk.c b/src/chunk.c index 3ac190633..9cfaa010a 100644 --- a/src/chunk.c +++ b/src/chunk.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "chunk.h" #include "audio_format.h" #include "tag.h" diff --git a/src/client.c b/src/client.c index 827f1d752..dae7b8d20 100644 --- a/src/client.c +++ b/src/client.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "client_internal.h" bool client_is_expired(const struct client *client) diff --git a/src/client_event.c b/src/client_event.c index 93279b283..e67bb1d70 100644 --- a/src/client_event.c +++ b/src/client_event.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "client_internal.h" #include "main.h" diff --git a/src/client_expire.c b/src/client_expire.c index 372af1774..f544a0ff5 100644 --- a/src/client_expire.c +++ b/src/client_expire.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "client_internal.h" static guint expire_source_id; diff --git a/src/client_global.c b/src/client_global.c index d99e00b82..2c5e26416 100644 --- a/src/client_global.c +++ b/src/client_global.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "client_internal.h" #include "conf.h" diff --git a/src/client_idle.c b/src/client_idle.c index c6d0bc006..23011b8c5 100644 --- a/src/client_idle.c +++ b/src/client_idle.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "client_internal.h" #include "idle.h" diff --git a/src/client_list.c b/src/client_list.c index 80eb7a29d..f2134d5f2 100644 --- a/src/client_list.c +++ b/src/client_list.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "client_internal.h" #include <assert.h> diff --git a/src/client_new.c b/src/client_new.c index bc7ee2140..c2c3a1e30 100644 --- a/src/client_new.c +++ b/src/client_new.c @@ -17,11 +17,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "client_internal.h" #include "fifo_buffer.h" #include "socket_util.h" #include "permission.h" -#include "config.h" #include <assert.h> #include <unistd.h> diff --git a/src/client_process.c b/src/client_process.c index 2f69cc6a8..18976c941 100644 --- a/src/client_process.c +++ b/src/client_process.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "client_internal.h" #include <string.h> diff --git a/src/client_read.c b/src/client_read.c index 1d64035e3..534bf5a6f 100644 --- a/src/client_read.c +++ b/src/client_read.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "client_internal.h" #include "fifo_buffer.h" diff --git a/src/client_write.c b/src/client_write.c index 686c7d96a..9bac20fa5 100644 --- a/src/client_write.c +++ b/src/client_write.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "client_internal.h" #include <assert.h> diff --git a/src/cmdline.c b/src/cmdline.c index 695857d54..48b16325e 100644 --- a/src/cmdline.c +++ b/src/cmdline.c @@ -17,13 +17,13 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "cmdline.h" #include "path.h" #include "log.h" #include "conf.h" #include "decoder_list.h" #include "decoder_plugin.h" -#include "config.h" #include "output_list.h" #include "ls.h" diff --git a/src/command.c b/src/command.c index 2bd84d3a3..3466da4d1 100644 --- a/src/command.c +++ b/src/command.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "command.h" #include "player_control.h" #include "playlist.h" @@ -47,7 +48,6 @@ #include "path.h" #include "replay_gain.h" #include "idle.h" -#include "config.h" #ifdef ENABLE_SQLITE #include "sticker.h" diff --git a/src/compress.c b/src/compress.c index 3a0b4beb0..27f223bd7 100644 --- a/src/compress.c +++ b/src/compress.c @@ -21,6 +21,7 @@ * Imported from AudioCompress by J. Shagam <fluffy@beesbuzz.biz> */ +#include "config.h" #include "compress.h" #include <glib.h> diff --git a/src/conf.c b/src/conf.c index 647ddec38..574ad9ddb 100644 --- a/src/conf.c +++ b/src/conf.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "conf.h" #include "utils.h" #include "tokenizer.h" diff --git a/src/crossfade.c b/src/crossfade.c index 01552bf65..ae94d363b 100644 --- a/src/crossfade.c +++ b/src/crossfade.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "crossfade.h" #include "pcm_mix.h" #include "chunk.h" diff --git a/src/cue/cue_tag.c b/src/cue/cue_tag.c index e45b26a7e..6c042a725 100644 --- a/src/cue/cue_tag.c +++ b/src/cue/cue_tag.c @@ -1,3 +1,4 @@ +#include "config.h" #include "cue_tag.h" static struct tag* diff --git a/src/cue/cue_tag.h b/src/cue/cue_tag.h index adc4c466e..aea585338 100644 --- a/src/cue/cue_tag.h +++ b/src/cue/cue_tag.h @@ -1,12 +1,13 @@ #ifndef MPD_CUE_TAG_H #define MPD_CUE_TAG_H -#include "config.h" +#include "check.h" #ifdef HAVE_CUE /* libcue */ +#include "tag.h" + #include <libcue/libcue.h> -#include "../tag.h" struct tag* cue_tag_file( FILE*, diff --git a/src/database.c b/src/database.c index 2164a69b7..b1c0df764 100644 --- a/src/database.c +++ b/src/database.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "database.h" #include "directory.h" #include "directory_save.h" @@ -26,7 +27,6 @@ #include "text_file.h" #include "tag.h" #include "tag_internal.h" -#include "config.h" #include <glib.h> diff --git a/src/dbUtils.c b/src/dbUtils.c index 9978daa43..359c8db47 100644 --- a/src/dbUtils.c +++ b/src/dbUtils.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "dbUtils.h" #include "locate.h" #include "directory.h" diff --git a/src/decoder/.#flac_plugin.c b/src/decoder/.#flac_plugin.c new file mode 120000 index 000000000..d86abda4a --- /dev/null +++ b/src/decoder/.#flac_plugin.c @@ -0,0 +1 @@ +max@woodpecker.roonstrasse.net.11431:1257744648
\ No newline at end of file diff --git a/src/decoder/_flac_common.c b/src/decoder/_flac_common.c index 70fc2cbcc..77483efcb 100644 --- a/src/decoder/_flac_common.c +++ b/src/decoder/_flac_common.c @@ -21,6 +21,7 @@ * Common data structures and functions used by FLAC and OggFLAC */ +#include "config.h" #include "_flac_common.h" #include "flac_metadata.h" #include "flac_pcm.h" diff --git a/src/decoder/_ogg_common.c b/src/decoder/_ogg_common.c index 6c6553422..d838e0ff4 100644 --- a/src/decoder/_ogg_common.c +++ b/src/decoder/_ogg_common.c @@ -21,8 +21,8 @@ * Common functions used for Ogg data streams (Ogg-Vorbis and OggFLAC) */ +#include "config.h" #include "_ogg_common.h" -#include "../utils.h" ogg_stream_type ogg_stream_type_detect(struct input_stream *inStream) { diff --git a/src/decoder/_ogg_common.h b/src/decoder/_ogg_common.h index e650c366d..eca5d40e0 100644 --- a/src/decoder/_ogg_common.h +++ b/src/decoder/_ogg_common.h @@ -24,7 +24,7 @@ #ifndef MPD_OGG_COMMON_H #define MPD_OGG_COMMON_H -#include "../decoder_api.h" +#include "decoder_api.h" typedef enum _ogg_stream_type { VORBIS, FLAC } ogg_stream_type; diff --git a/src/decoder/audiofile_plugin.c b/src/decoder/audiofile_plugin.c index b4959f6c2..ca096c06e 100644 --- a/src/decoder/audiofile_plugin.c +++ b/src/decoder/audiofile_plugin.c @@ -17,7 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../decoder_api.h" +#include "config.h" +#include "decoder_api.h" #include <audiofile.h> #include <af_vfs.h> diff --git a/src/decoder/faad_plugin.c b/src/decoder/faad_plugin.c index 516f741c7..73a8a85b9 100644 --- a/src/decoder/faad_plugin.c +++ b/src/decoder/faad_plugin.c @@ -17,9 +17,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../decoder_api.h" -#include "decoder_buffer.h" #include "config.h" +#include "decoder_api.h" +#include "decoder_buffer.h" #define AAC_MAX_CHANNELS 6 diff --git a/src/decoder/ffmpeg_plugin.c b/src/decoder/ffmpeg_plugin.c index 63f0f7ece..41fc70908 100644 --- a/src/decoder/ffmpeg_plugin.c +++ b/src/decoder/ffmpeg_plugin.c @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../decoder_api.h" #include "config.h" +#include "decoder_api.h" #include <glib.h> diff --git a/src/decoder/flac_metadata.c b/src/decoder/flac_metadata.c index 912559c8d..1ff99f151 100644 --- a/src/decoder/flac_metadata.c +++ b/src/decoder/flac_metadata.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "flac_metadata.h" #include "replay_gain.h" #include "tag.h" diff --git a/src/decoder/flac_pcm.c b/src/decoder/flac_pcm.c index d37ef54e2..737d5b043 100644 --- a/src/decoder/flac_pcm.c +++ b/src/decoder/flac_pcm.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "flac_pcm.h" static void flac_convert_stereo16(int16_t *dest, diff --git a/src/decoder/fluidsynth_plugin.c b/src/decoder/fluidsynth_plugin.c index 99c874c09..3e8a4edc4 100644 --- a/src/decoder/fluidsynth_plugin.c +++ b/src/decoder/fluidsynth_plugin.c @@ -26,9 +26,10 @@ * */ -#include "../decoder_api.h" -#include "../timer.h" -#include "../conf.h" +#include "config.h" +#include "decoder_api.h" +#include "timer.h" +#include "conf.h" #include <glib.h> diff --git a/src/decoder/mad_plugin.c b/src/decoder/mad_plugin.c index 27ddf655d..d8231014f 100644 --- a/src/decoder/mad_plugin.c +++ b/src/decoder/mad_plugin.c @@ -17,9 +17,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../decoder_api.h" -#include "../conf.h" #include "config.h" +#include "decoder_api.h" +#include "conf.h" #include "tag_id3.h" #include <assert.h> diff --git a/src/decoder/mikmod_plugin.c b/src/decoder/mikmod_plugin.c index 850232f34..1d5be2970 100644 --- a/src/decoder/mikmod_plugin.c +++ b/src/decoder/mikmod_plugin.c @@ -17,7 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../decoder_api.h" +#include "config.h" +#include "decoder_api.h" #include <glib.h> #include <mikmod.h> diff --git a/src/decoder/modplug_plugin.c b/src/decoder/modplug_plugin.c index 301c80674..7781511b6 100644 --- a/src/decoder/modplug_plugin.c +++ b/src/decoder/modplug_plugin.c @@ -17,7 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../decoder_api.h" +#include "config.h" +#include "decoder_api.h" #include <glib.h> #include <modplug.h> diff --git a/src/decoder/mp4ff_plugin.c b/src/decoder/mp4ff_plugin.c index 745d1e619..2905438e2 100644 --- a/src/decoder/mp4ff_plugin.c +++ b/src/decoder/mp4ff_plugin.c @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../decoder_api.h" #include "config.h" +#include "decoder_api.h" #include <glib.h> diff --git a/src/decoder/mpcdec_plugin.c b/src/decoder/mpcdec_plugin.c index a684da104..b7c5af5f8 100644 --- a/src/decoder/mpcdec_plugin.c +++ b/src/decoder/mpcdec_plugin.c @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../decoder_api.h" #include "config.h" +#include "decoder_api.h" #ifdef MPC_IS_OLD_API #include <mpcdec/mpcdec.h> diff --git a/src/decoder/sidplay_plugin.cxx b/src/decoder/sidplay_plugin.cxx index 079b178fb..f88e5b582 100644 --- a/src/decoder/sidplay_plugin.cxx +++ b/src/decoder/sidplay_plugin.cxx @@ -17,6 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" + extern "C" { #include "../decoder_api.h" } diff --git a/src/decoder/sndfile_decoder_plugin.c b/src/decoder/sndfile_decoder_plugin.c index 59993ef89..c5ac651a3 100644 --- a/src/decoder/sndfile_decoder_plugin.c +++ b/src/decoder/sndfile_decoder_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "decoder_api.h" #include <sndfile.h> diff --git a/src/decoder/vorbis_plugin.c b/src/decoder/vorbis_plugin.c index 0f37956ae..71d38c3ba 100755 --- a/src/decoder/vorbis_plugin.c +++ b/src/decoder/vorbis_plugin.c @@ -17,11 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* TODO 'ogg' should probably be replaced with 'oggvorbis' in all instances */ - -#include "config.h" /* must be first for large file support */ -#include "_ogg_common.h" #include "config.h" +#include "_ogg_common.h" #include "uri.h" #ifndef HAVE_TREMOR diff --git a/src/decoder/wavpack_plugin.c b/src/decoder/wavpack_plugin.c index efffcaeb1..c784d51db 100644 --- a/src/decoder/wavpack_plugin.c +++ b/src/decoder/wavpack_plugin.c @@ -17,9 +17,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../decoder_api.h" -#include "../path.h" -#include "../utils.h" +#include "config.h" +#include "decoder_api.h" +#include "path.h" +#include "utils.h" #include <wavpack/wavpack.h> #include <glib.h> diff --git a/src/decoder/wildmidi_plugin.c b/src/decoder/wildmidi_plugin.c index 8bad6943a..718f24c2e 100644 --- a/src/decoder/wildmidi_plugin.c +++ b/src/decoder/wildmidi_plugin.c @@ -17,7 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../decoder_api.h" +#include "config.h" +#include "decoder_api.h" #include <glib.h> diff --git a/src/decoder_api.c b/src/decoder_api.c index 2350396a9..c6c23182e 100644 --- a/src/decoder_api.c +++ b/src/decoder_api.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "decoder_api.h" #include "decoder_internal.h" #include "decoder_control.h" diff --git a/src/decoder_api.h b/src/decoder_api.h index 2ecd98ce7..81f75623a 100644 --- a/src/decoder_api.h +++ b/src/decoder_api.h @@ -27,6 +27,7 @@ #ifndef MPD_DECODER_API_H #define MPD_DECODER_API_H +#include "check.h" #include "decoder_command.h" #include "decoder_plugin.h" #include "input_stream.h" diff --git a/src/decoder_buffer.c b/src/decoder_buffer.c index b6fa90004..a313eacc5 100644 --- a/src/decoder_buffer.c +++ b/src/decoder_buffer.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "decoder_buffer.h" #include "decoder_api.h" diff --git a/src/decoder_control.c b/src/decoder_control.c index 7fe18088b..a26edd150 100644 --- a/src/decoder_control.c +++ b/src/decoder_control.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "decoder_control.h" #include "player_control.h" diff --git a/src/decoder_internal.c b/src/decoder_internal.c index d40ef89d7..60c43e679 100644 --- a/src/decoder_internal.c +++ b/src/decoder_internal.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "decoder_internal.h" #include "decoder_control.h" #include "player_control.h" diff --git a/src/decoder_list.c b/src/decoder_list.c index 2ee4f3ec9..c322bc433 100644 --- a/src/decoder_list.c +++ b/src/decoder_list.c @@ -17,10 +17,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "decoder_list.h" #include "decoder_plugin.h" #include "utils.h" -#include "config.h" #include "conf.h" #include <glib.h> diff --git a/src/decoder_plugin.c b/src/decoder_plugin.c index 79b0d5322..b5966ff8d 100644 --- a/src/decoder_plugin.c +++ b/src/decoder_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "decoder_plugin.h" #include "utils.h" diff --git a/src/decoder_print.c b/src/decoder_print.c index b2d394093..5dbb32803 100644 --- a/src/decoder_print.c +++ b/src/decoder_print.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "decoder_print.h" #include "decoder_list.h" #include "decoder_plugin.h" diff --git a/src/decoder_thread.c b/src/decoder_thread.c index 9c12ecb07..c055d2a32 100644 --- a/src/decoder_thread.c +++ b/src/decoder_thread.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "decoder_thread.h" #include "decoder_control.h" #include "decoder_internal.h" diff --git a/src/directory.c b/src/directory.c index ef8c038a3..62a297e14 100644 --- a/src/directory.c +++ b/src/directory.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "directory.h" #include "song.h" #include "path.h" diff --git a/src/directory.h b/src/directory.h index f93d5b8a1..c8789fbe3 100644 --- a/src/directory.h +++ b/src/directory.h @@ -20,7 +20,7 @@ #ifndef MPD_DIRECTORY_H #define MPD_DIRECTORY_H -#include "config.h" /* must be first for large file support */ +#include "check.h" #include "dirvec.h" #include "songvec.h" diff --git a/src/directory_print.c b/src/directory_print.c index e0575e80f..8e86abf41 100644 --- a/src/directory_print.c +++ b/src/directory_print.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "directory_print.h" #include "directory.h" #include "client.h" diff --git a/src/directory_save.c b/src/directory_save.c index 317f64bb4..0204e71e1 100644 --- a/src/directory_save.c +++ b/src/directory_save.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "directory_save.h" #include "directory.h" #include "song.h" diff --git a/src/dirvec.c b/src/dirvec.c index 3ccb5d413..8061835d5 100644 --- a/src/dirvec.c +++ b/src/dirvec.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "dirvec.h" #include "directory.h" diff --git a/src/encoder/lame_encoder.c b/src/encoder/lame_encoder.c index acaf4470f..812ff39c5 100644 --- a/src/encoder/lame_encoder.c +++ b/src/encoder/lame_encoder.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "encoder_api.h" #include "encoder_plugin.h" #include "audio_format.h" diff --git a/src/encoder/null_encoder.c b/src/encoder/null_encoder.c index 92052b095..b1c886a02 100644 --- a/src/encoder/null_encoder.c +++ b/src/encoder/null_encoder.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "encoder_api.h" #include "encoder_plugin.h" diff --git a/src/encoder/twolame_encoder.c b/src/encoder/twolame_encoder.c index 5a8a82d81..cddf5773e 100644 --- a/src/encoder/twolame_encoder.c +++ b/src/encoder/twolame_encoder.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "encoder_api.h" #include "encoder_plugin.h" #include "audio_format.h" diff --git a/src/encoder/vorbis_encoder.c b/src/encoder/vorbis_encoder.c index a5f6387f6..2fa0fd950 100644 --- a/src/encoder/vorbis_encoder.c +++ b/src/encoder/vorbis_encoder.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "encoder_api.h" #include "encoder_plugin.h" #include "tag.h" diff --git a/src/encoder/wave_encoder.c b/src/encoder/wave_encoder.c index f06dea307..8cf8912db 100644 --- a/src/encoder/wave_encoder.c +++ b/src/encoder/wave_encoder.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "encoder_api.h" #include "encoder_plugin.h" diff --git a/src/encoder_list.c b/src/encoder_list.c index f4b4392df..3be5ef213 100644 --- a/src/encoder_list.c +++ b/src/encoder_list.c @@ -17,9 +17,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "encoder_list.h" #include "encoder_plugin.h" -#include "config.h" #include <string.h> diff --git a/src/event_pipe.c b/src/event_pipe.c index 4b7e741ff..dbec23aa8 100644 --- a/src/event_pipe.c +++ b/src/event_pipe.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "event_pipe.h" #include "fd_util.h" diff --git a/src/exclude.c b/src/exclude.c index 59354fa82..5bf7ccbbd 100644 --- a/src/exclude.c +++ b/src/exclude.c @@ -22,6 +22,7 @@ * */ +#include "config.h" #include "exclude.h" #include "path.h" diff --git a/src/fifo_buffer.c b/src/fifo_buffer.c index adee438c0..ceff6e605 100644 --- a/src/fifo_buffer.c +++ b/src/fifo_buffer.c @@ -28,6 +28,7 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "config.h" #include "fifo_buffer.h" #include <glib.h> diff --git a/src/filter/chain_filter_plugin.c b/src/filter/chain_filter_plugin.c index ec8bef5c0..5cd8aa014 100644 --- a/src/filter/chain_filter_plugin.c +++ b/src/filter/chain_filter_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "filter/chain_filter_plugin.h" #include "filter_plugin.h" #include "filter_internal.h" diff --git a/src/filter/convert_filter_plugin.c b/src/filter/convert_filter_plugin.c index d197dbdb9..982ec7c4c 100644 --- a/src/filter/convert_filter_plugin.c +++ b/src/filter/convert_filter_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "filter/convert_filter_plugin.h" #include "filter_plugin.h" #include "filter_internal.h" diff --git a/src/filter/null_filter_plugin.c b/src/filter/null_filter_plugin.c index 689388558..5671ba907 100644 --- a/src/filter/null_filter_plugin.c +++ b/src/filter/null_filter_plugin.c @@ -24,6 +24,7 @@ * plugins. */ +#include "config.h" #include "filter_plugin.h" #include "filter_internal.h" #include "filter_registry.h" diff --git a/src/filter/volume_filter_plugin.c b/src/filter/volume_filter_plugin.c index 298ca2f36..f6639a75f 100644 --- a/src/filter/volume_filter_plugin.c +++ b/src/filter/volume_filter_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "filter/volume_filter_plugin.h" #include "filter_plugin.h" #include "filter_internal.h" diff --git a/src/filter_plugin.c b/src/filter_plugin.c index e5c1d5cd8..456772677 100644 --- a/src/filter_plugin.c +++ b/src/filter_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "filter_plugin.h" #include "filter_internal.h" #include "filter_registry.h" diff --git a/src/filter_registry.c b/src/filter_registry.c index c8887aabf..a6aaa2bfb 100644 --- a/src/filter_registry.c +++ b/src/filter_registry.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "filter_registry.h" #include "filter_plugin.h" diff --git a/src/icy_metadata.c b/src/icy_metadata.c index 4089e9c6f..009104b74 100644 --- a/src/icy_metadata.c +++ b/src/icy_metadata.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "icy_metadata.h" #include "tag.h" diff --git a/src/icy_server.c b/src/icy_server.c index 486c62c36..a9e6bc496 100644 --- a/src/icy_server.c +++ b/src/icy_server.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "icy_server.h" #include <glib.h> diff --git a/src/idle.c b/src/idle.c index c0bb7a908..ea08e6a9b 100644 --- a/src/idle.c +++ b/src/idle.c @@ -22,6 +22,7 @@ * */ +#include "config.h" #include "idle.h" #include "event_pipe.h" diff --git a/src/inotify_queue.c b/src/inotify_queue.c index 4941f4905..d486e21db 100644 --- a/src/inotify_queue.c +++ b/src/inotify_queue.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "inotify_queue.h" #include "update.h" diff --git a/src/inotify_source.c b/src/inotify_source.c index fd39f8481..31dc1e7dc 100644 --- a/src/inotify_source.c +++ b/src/inotify_source.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "inotify_source.h" #include "fifo_buffer.h" #include "fd_util.h" diff --git a/src/inotify_update.h b/src/inotify_update.h index 45466afae..f77e183a6 100644 --- a/src/inotify_update.h +++ b/src/inotify_update.h @@ -20,7 +20,7 @@ #ifndef MPD_INOTIFY_UPDATE_H #define MPD_INOTIFY_UPDATE_H -#include "config.h" +#include "check.h" #ifdef HAVE_INOTIFY_INIT diff --git a/src/input/archive_input_plugin.c b/src/input/archive_input_plugin.c index 6239f4298..a98bd9e2a 100644 --- a/src/input/archive_input_plugin.c +++ b/src/input/archive_input_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "input/archive_input_plugin.h" #include "archive_api.h" #include "archive_list.h" diff --git a/src/input/curl_input_plugin.c b/src/input/curl_input_plugin.c index b8e9435a0..49defc7fe 100644 --- a/src/input/curl_input_plugin.c +++ b/src/input/curl_input_plugin.c @@ -17,10 +17,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "input/curl_input_plugin.h" #include "input_plugin.h" #include "conf.h" -#include "config.h" #include "tag.h" #include "icy_metadata.h" #include "glib_compat.h" diff --git a/src/input/mms_input_plugin.c b/src/input/mms_input_plugin.c index 335571bef..eb2665afb 100644 --- a/src/input/mms_input_plugin.c +++ b/src/input/mms_input_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "input/mms_input_plugin.h" #include "input_plugin.h" diff --git a/src/input_stream.c b/src/input_stream.c index c6da87996..0174b5a2e 100644 --- a/src/input_stream.c +++ b/src/input_stream.c @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "input_plugin.h" #include "config.h" +#include "input_plugin.h" #include "conf.h" #include "input/file_input_plugin.h" diff --git a/src/input_stream.h b/src/input_stream.h index edecb8460..a617632a0 100644 --- a/src/input_stream.h +++ b/src/input_stream.h @@ -20,6 +20,8 @@ #ifndef MPD_INPUT_STREAM_H #define MPD_INPUT_STREAM_H +#include "check.h" + #include <glib.h> #include <stddef.h> diff --git a/src/listen.c b/src/listen.c index c1611d4f0..2b1ac7f5d 100644 --- a/src/listen.c +++ b/src/listen.c @@ -17,13 +17,13 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "listen.h" #include "socket_util.h" #include "client.h" #include "conf.h" #include "fd_util.h" #include "glib_compat.h" -#include "config.h" #include <sys/types.h> #include <sys/stat.h> diff --git a/src/locate.c b/src/locate.c index 7b4721fa9..7bc23db16 100644 --- a/src/locate.c +++ b/src/locate.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "locate.h" #include "path.h" #include "tag.h" @@ -17,11 +17,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "log.h" #include "conf.h" #include "utils.h" #include "fd_util.h" -#include "config.h" #include <assert.h> #include <sys/types.h> @@ -17,10 +17,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "ls.h" #include "uri.h" #include "client.h" -#include "config.h" #include <assert.h> #include <string.h> diff --git a/src/main.c b/src/main.c index 2c970ba0a..c74ffdb14 100644 --- a/src/main.c +++ b/src/main.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "main.h" #include "daemon.h" #include "client.h" @@ -48,7 +49,6 @@ #include "state_file.h" #include "tag.h" #include "dbUtils.h" -#include "config.h" #include "normalize.h" #include "zeroconf.h" #include "event_pipe.h" diff --git a/src/mapper.c b/src/mapper.c index a48e12a35..bc3647686 100644 --- a/src/mapper.c +++ b/src/mapper.c @@ -21,6 +21,7 @@ * Maps directory and song objects to file system paths. */ +#include "config.h" #include "mapper.h" #include "directory.h" #include "song.h" diff --git a/src/mixer/alsa_mixer_plugin.c b/src/mixer/alsa_mixer_plugin.c index baf12030c..6726f785a 100644 --- a/src/mixer/alsa_mixer_plugin.c +++ b/src/mixer/alsa_mixer_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "mixer_api.h" #include "output_api.h" diff --git a/src/mixer/oss_mixer_plugin.c b/src/mixer/oss_mixer_plugin.c index 631107b70..6e75edd9b 100644 --- a/src/mixer/oss_mixer_plugin.c +++ b/src/mixer/oss_mixer_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "mixer_api.h" #include "output_api.h" #include "fd_util.h" diff --git a/src/mixer/pulse_mixer_plugin.c b/src/mixer/pulse_mixer_plugin.c index 53f4436ea..5669e05c4 100644 --- a/src/mixer/pulse_mixer_plugin.c +++ b/src/mixer/pulse_mixer_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "pulse_mixer_plugin.h" #include "mixer_api.h" #include "output/pulse_output_plugin.h" diff --git a/src/mixer/software_mixer_plugin.c b/src/mixer/software_mixer_plugin.c index 062b9b3ef..30ae13013 100644 --- a/src/mixer/software_mixer_plugin.c +++ b/src/mixer/software_mixer_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "software_mixer_plugin.h" #include "mixer_api.h" #include "filter_plugin.h" diff --git a/src/mixer_all.c b/src/mixer_all.c index b9c1afdad..71f5c3c95 100644 --- a/src/mixer_all.c +++ b/src/mixer_all.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "mixer_all.h" #include "mixer_control.h" #include "output_all.h" diff --git a/src/mixer_api.c b/src/mixer_api.c index cff23a397..67b7037ef 100644 --- a/src/mixer_api.c +++ b/src/mixer_api.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "mixer_api.h" #undef G_LOG_DOMAIN diff --git a/src/mixer_control.c b/src/mixer_control.c index 3369f9ae8..42b59f51e 100644 --- a/src/mixer_control.c +++ b/src/mixer_control.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "mixer_control.h" #include "mixer_api.h" diff --git a/src/mixer_type.c b/src/mixer_type.c index 6cf007856..804ecafef 100644 --- a/src/mixer_type.c +++ b/src/mixer_type.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "mixer_type.h" #include <assert.h> diff --git a/src/normalize.c b/src/normalize.c index 63c0d15cb..f8304cd1f 100644 --- a/src/normalize.c +++ b/src/normalize.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "normalize.h" #include "compress.h" #include "conf.h" diff --git a/src/notify.c b/src/notify.c index 9168867d6..8954a8e61 100644 --- a/src/notify.c +++ b/src/notify.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "notify.h" void notify_init(struct notify *notify) diff --git a/src/output/alsa_plugin.c b/src/output/alsa_plugin.c index 64a8127ba..2c642015d 100644 --- a/src/output/alsa_plugin.c +++ b/src/output/alsa_plugin.c @@ -17,7 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../output_api.h" +#include "config.h" +#include "output_api.h" #include "mixer_list.h" #include <glib.h> diff --git a/src/output/ao_plugin.c b/src/output/ao_plugin.c index 12d2b7552..d69175272 100644 --- a/src/output/ao_plugin.c +++ b/src/output/ao_plugin.c @@ -17,7 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../output_api.h" +#include "config.h" +#include "output_api.h" #include <ao/ao.h> #include <glib.h> diff --git a/src/output/fifo_output_plugin.c b/src/output/fifo_output_plugin.c index b5e6f5314..658c77340 100644 --- a/src/output/fifo_output_plugin.c +++ b/src/output/fifo_output_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "output_api.h" #include "utils.h" #include "timer.h" diff --git a/src/output/httpd_client.c b/src/output/httpd_client.c index 62ede81be..83f08372e 100644 --- a/src/output/httpd_client.c +++ b/src/output/httpd_client.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "httpd_client.h" #include "httpd_internal.h" #include "fifo_buffer.h" diff --git a/src/output/httpd_output_plugin.c b/src/output/httpd_output_plugin.c index 53bcc2deb..a1f8be73a 100644 --- a/src/output/httpd_output_plugin.c +++ b/src/output/httpd_output_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "httpd_internal.h" #include "httpd_client.h" #include "output_api.h" diff --git a/src/output/jack_output_plugin.c b/src/output/jack_output_plugin.c index b099cdb9e..7e5a52993 100644 --- a/src/output/jack_output_plugin.c +++ b/src/output/jack_output_plugin.c @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "output_api.h" #include "config.h" +#include "output_api.h" #include <assert.h> diff --git a/src/output/mvp_plugin.c b/src/output/mvp_plugin.c index 7e6dd6d31..5a9a9b48b 100644 --- a/src/output/mvp_plugin.c +++ b/src/output/mvp_plugin.c @@ -22,6 +22,7 @@ * http://mvpmc.sourceforge.net/ */ +#include "config.h" #include "output_api.h" #include "fd_util.h" diff --git a/src/output/null_plugin.c b/src/output/null_plugin.c index e9731b019..495db656b 100644 --- a/src/output/null_plugin.c +++ b/src/output/null_plugin.c @@ -17,8 +17,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../output_api.h" -#include "../timer.h" +#include "config.h" +#include "output_api.h" +#include "timer.h" #include <glib.h> diff --git a/src/output/openal_plugin.c b/src/output/openal_plugin.c index 92ee82ef3..95337cb10 100644 --- a/src/output/openal_plugin.c +++ b/src/output/openal_plugin.c @@ -17,9 +17,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../output_api.h" -#include "../timer.h" #include "config.h" +#include "output_api.h" +#include "timer.h" #include <glib.h> diff --git a/src/output/oss_plugin.c b/src/output/oss_plugin.c index 6518c3f49..b02d7d62e 100644 --- a/src/output/oss_plugin.c +++ b/src/output/oss_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "output_api.h" #include "mixer_list.h" #include "fd_util.h" diff --git a/src/output/osx_plugin.c b/src/output/osx_plugin.c index 04173bf79..afcd143b3 100644 --- a/src/output/osx_plugin.c +++ b/src/output/osx_plugin.c @@ -17,7 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../output_api.h" +#include "config.h" +#include "output_api.h" #include <glib.h> #include <AudioUnit/AudioUnit.h> diff --git a/src/output/pipe_output_plugin.c b/src/output/pipe_output_plugin.c index 610ad9e8d..2a5841bae 100644 --- a/src/output/pipe_output_plugin.c +++ b/src/output/pipe_output_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "output_api.h" #include <stdio.h> diff --git a/src/output/pulse_output_plugin.c b/src/output/pulse_output_plugin.c index 13e1b6624..3da1b3593 100644 --- a/src/output/pulse_output_plugin.c +++ b/src/output/pulse_output_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "pulse_output_plugin.h" #include "output_api.h" #include "mixer_list.h" diff --git a/src/output/recorder_output_plugin.c b/src/output/recorder_output_plugin.c index 11dd6c041..f56ec0328 100644 --- a/src/output/recorder_output_plugin.c +++ b/src/output/recorder_output_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "output_api.h" #include "encoder_plugin.h" #include "encoder_list.h" diff --git a/src/output/shout_plugin.c b/src/output/shout_plugin.c index da90efd2d..750b09191 100644 --- a/src/output/shout_plugin.c +++ b/src/output/shout_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "output_api.h" #include "encoder_plugin.h" #include "encoder_list.h" diff --git a/src/output/solaris_output_plugin.c b/src/output/solaris_output_plugin.c index 4f3d86835..b187630ee 100644 --- a/src/output/solaris_output_plugin.c +++ b/src/output/solaris_output_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "output_api.h" #include "fd_util.h" diff --git a/src/output_all.c b/src/output_all.c index 29590abf0..415221aa4 100644 --- a/src/output_all.c +++ b/src/output_all.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "output_all.h" #include "output_internal.h" #include "output_control.h" diff --git a/src/output_command.c b/src/output_command.c index b47890043..9a720904d 100644 --- a/src/output_command.c +++ b/src/output_command.c @@ -24,6 +24,7 @@ * */ +#include "config.h" #include "output_command.h" #include "output_all.h" #include "output_internal.h" diff --git a/src/output_control.c b/src/output_control.c index 795d04a8c..5479263de 100644 --- a/src/output_control.c +++ b/src/output_control.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "output_control.h" #include "output_api.h" #include "output_internal.h" diff --git a/src/output_init.c b/src/output_init.c index a7272bfc2..a1b79c994 100644 --- a/src/output_init.c +++ b/src/output_init.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "output_control.h" #include "output_api.h" #include "output_internal.h" diff --git a/src/output_list.c b/src/output_list.c index fcb796751..71a294407 100644 --- a/src/output_list.c +++ b/src/output_list.c @@ -17,9 +17,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "output_list.h" #include "output_api.h" -#include "config.h" extern const struct audio_output_plugin shoutPlugin; extern const struct audio_output_plugin null_output_plugin; diff --git a/src/output_print.c b/src/output_print.c index 11e53c32c..9cbf75c9d 100644 --- a/src/output_print.c +++ b/src/output_print.c @@ -22,6 +22,7 @@ * */ +#include "config.h" #include "output_print.h" #include "output_internal.h" #include "output_all.h" diff --git a/src/output_state.c b/src/output_state.c index be135f6d0..81e3b0120 100644 --- a/src/output_state.c +++ b/src/output_state.c @@ -22,6 +22,7 @@ * */ +#include "config.h" #include "output_state.h" #include "output_internal.h" #include "output_all.h" diff --git a/src/output_thread.c b/src/output_thread.c index fb1701591..0b61ab171 100644 --- a/src/output_thread.c +++ b/src/output_thread.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "output_thread.h" #include "output_api.h" #include "output_internal.h" diff --git a/src/page.c b/src/page.c index 5ea03cd02..537137697 100644 --- a/src/page.c +++ b/src/page.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "page.h" #include <glib.h> diff --git a/src/path.c b/src/path.c index fc73ee7c9..62732fcb4 100644 --- a/src/path.c +++ b/src/path.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "path.h" #include "conf.h" diff --git a/src/pcm_byteswap.c b/src/pcm_byteswap.c index 1c1caeeca..5bd23398d 100644 --- a/src/pcm_byteswap.c +++ b/src/pcm_byteswap.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "pcm_byteswap.h" #include "pcm_buffer.h" diff --git a/src/pcm_channels.c b/src/pcm_channels.c index 38445f958..d82e46a67 100644 --- a/src/pcm_channels.c +++ b/src/pcm_channels.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "pcm_channels.h" #include "pcm_buffer.h" diff --git a/src/pcm_convert.c b/src/pcm_convert.c index 4879dc0ab..1d6299964 100644 --- a/src/pcm_convert.c +++ b/src/pcm_convert.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "pcm_convert.h" #include "pcm_channels.h" #include "pcm_format.h" diff --git a/src/pcm_dither.c b/src/pcm_dither.c index 45c11790c..0d1c7e004 100644 --- a/src/pcm_dither.c +++ b/src/pcm_dither.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "pcm_dither.h" #include "pcm_prng.h" diff --git a/src/pcm_format.c b/src/pcm_format.c index 64e5167b5..8da253db9 100644 --- a/src/pcm_format.c +++ b/src/pcm_format.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "pcm_format.h" #include "pcm_dither.h" #include "pcm_buffer.h" diff --git a/src/pcm_mix.c b/src/pcm_mix.c index d1e716731..34b4b9175 100644 --- a/src/pcm_mix.c +++ b/src/pcm_mix.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "pcm_mix.h" #include "pcm_volume.h" #include "pcm_utils.h" diff --git a/src/pcm_resample.c b/src/pcm_resample.c index f09c65a32..fea499e07 100644 --- a/src/pcm_resample.c +++ b/src/pcm_resample.c @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "pcm_resample_internal.h" #include "config.h" +#include "pcm_resample_internal.h" #ifdef HAVE_LIBSAMPLERATE #include "conf.h" diff --git a/src/pcm_resample.h b/src/pcm_resample.h index 9d03bbfbf..a17b12d8b 100644 --- a/src/pcm_resample.h +++ b/src/pcm_resample.h @@ -20,8 +20,8 @@ #ifndef MPD_PCM_RESAMPLE_H #define MPD_PCM_RESAMPLE_H +#include "check.h" #include "pcm_buffer.h" -#include "config.h" #include <stdint.h> #include <stddef.h> diff --git a/src/pcm_resample_fallback.c b/src/pcm_resample_fallback.c index 9a403ddc7..fcc97d9cd 100644 --- a/src/pcm_resample_fallback.c +++ b/src/pcm_resample_fallback.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "pcm_resample_internal.h" #include <assert.h> diff --git a/src/pcm_resample_internal.h b/src/pcm_resample_internal.h index 74363a590..cdb3c9a2f 100644 --- a/src/pcm_resample_internal.h +++ b/src/pcm_resample_internal.h @@ -27,8 +27,8 @@ #ifndef MPD_PCM_RESAMPLE_INTERNAL_H #define MPD_PCM_RESAMPLE_INTERNAL_H +#include "check.h" #include "pcm_resample.h" -#include "config.h" #ifdef HAVE_LIBSAMPLERATE diff --git a/src/pcm_resample_libsamplerate.c b/src/pcm_resample_libsamplerate.c index 66a1c3193..71b76b86d 100644 --- a/src/pcm_resample_libsamplerate.c +++ b/src/pcm_resample_libsamplerate.c @@ -17,9 +17,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "pcm_resample_internal.h" #include "conf.h" -#include "config.h" #include <glib.h> diff --git a/src/pcm_volume.c b/src/pcm_volume.c index 2a94c1890..ca720a30e 100644 --- a/src/pcm_volume.c +++ b/src/pcm_volume.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "pcm_volume.h" #include "pcm_utils.h" #include "audio_format.h" diff --git a/src/permission.c b/src/permission.c index a65941771..94aca70cf 100644 --- a/src/permission.c +++ b/src/permission.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "permission.h" #include "conf.h" diff --git a/src/pipe.c b/src/pipe.c index c9f0d159c..7cce06075 100644 --- a/src/pipe.c +++ b/src/pipe.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "pipe.h" #include "buffer.h" #include "chunk.h" diff --git a/src/player_control.c b/src/player_control.c index 220d39a22..fc321b173 100644 --- a/src/player_control.c +++ b/src/player_control.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "player_control.h" #include "decoder_control.h" #include "path.h" diff --git a/src/player_thread.c b/src/player_thread.c index c527c57b6..0581b111a 100644 --- a/src/player_thread.c +++ b/src/player_thread.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "player_thread.h" #include "player_control.h" #include "decoder_control.h" diff --git a/src/playlist.c b/src/playlist.c index 6ca9d014b..691fe5d26 100644 --- a/src/playlist.c +++ b/src/playlist.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "playlist_internal.h" #include "playlist_save.h" #include "player_control.h" diff --git a/src/playlist/asx_playlist_plugin.c b/src/playlist/asx_playlist_plugin.c index f79e3280d..901212f90 100644 --- a/src/playlist/asx_playlist_plugin.c +++ b/src/playlist/asx_playlist_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "playlist/asx_playlist_plugin.h" #include "playlist_plugin.h" #include "input_stream.h" diff --git a/src/playlist/extm3u_playlist_plugin.c b/src/playlist/extm3u_playlist_plugin.c index 3f55e5ad4..bd81ff9fb 100644 --- a/src/playlist/extm3u_playlist_plugin.c +++ b/src/playlist/extm3u_playlist_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "playlist/extm3u_playlist_plugin.h" #include "playlist_plugin.h" #include "text_input_stream.h" diff --git a/src/playlist/lastfm_playlist_plugin.c b/src/playlist/lastfm_playlist_plugin.c index 70e51c2fc..c776d25ab 100644 --- a/src/playlist/lastfm_playlist_plugin.c +++ b/src/playlist/lastfm_playlist_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "playlist/lastfm_playlist_plugin.h" #include "playlist_plugin.h" #include "playlist_list.h" diff --git a/src/playlist/m3u_playlist_plugin.c b/src/playlist/m3u_playlist_plugin.c index db5db99fc..dbabea2e6 100644 --- a/src/playlist/m3u_playlist_plugin.c +++ b/src/playlist/m3u_playlist_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "playlist/m3u_playlist_plugin.h" #include "playlist_plugin.h" #include "text_input_stream.h" diff --git a/src/playlist/pls_playlist_plugin.c b/src/playlist/pls_playlist_plugin.c index a5d8bbcbe..5308b7160 100644 --- a/src/playlist/pls_playlist_plugin.c +++ b/src/playlist/pls_playlist_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "playlist/pls_playlist_plugin.h" #include "playlist_plugin.h" #include "input_stream.h" diff --git a/src/playlist/xspf_playlist_plugin.c b/src/playlist/xspf_playlist_plugin.c index 6c81d979d..687765b3a 100644 --- a/src/playlist/xspf_playlist_plugin.c +++ b/src/playlist/xspf_playlist_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "playlist/xspf_playlist_plugin.h" #include "playlist_plugin.h" #include "input_stream.h" diff --git a/src/playlist_control.c b/src/playlist_control.c index 66e7934dc..2f75b504f 100644 --- a/src/playlist_control.c +++ b/src/playlist_control.c @@ -22,6 +22,7 @@ * */ +#include "config.h" #include "playlist_internal.h" #include "player_control.h" diff --git a/src/playlist_edit.c b/src/playlist_edit.c index 8052f8470..956c33d8e 100644 --- a/src/playlist_edit.c +++ b/src/playlist_edit.c @@ -23,6 +23,7 @@ * */ +#include "config.h" #include "playlist_internal.h" #include "player_control.h" #include "database.h" diff --git a/src/playlist_global.c b/src/playlist_global.c index dcb972490..8cfbf2c5d 100644 --- a/src/playlist_global.c +++ b/src/playlist_global.c @@ -22,6 +22,7 @@ * */ +#include "config.h" #include "playlist.h" #include "playlist_state.h" #include "event_pipe.h" diff --git a/src/playlist_list.c b/src/playlist_list.c index d6359463e..2ea174a2f 100644 --- a/src/playlist_list.c +++ b/src/playlist_list.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "playlist_list.h" #include "playlist_plugin.h" #include "playlist/extm3u_playlist_plugin.h" @@ -29,7 +30,6 @@ #include "uri.h" #include "utils.h" #include "conf.h" -#include "config.h" #include <glib.h> diff --git a/src/playlist_print.c b/src/playlist_print.c index 1ca11e4c1..f414ee0ac 100644 --- a/src/playlist_print.c +++ b/src/playlist_print.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "playlist_print.h" #include "queue_print.h" #include "stored_playlist.h" diff --git a/src/playlist_queue.c b/src/playlist_queue.c index 55c394bd7..0b4231f59 100644 --- a/src/playlist_queue.c +++ b/src/playlist_queue.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "playlist_queue.h" #include "playlist_list.h" #include "playlist_plugin.h" diff --git a/src/playlist_save.c b/src/playlist_save.c index d56c0f324..247b08e4c 100644 --- a/src/playlist_save.c +++ b/src/playlist_save.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "playlist_save.h" #include "stored_playlist.h" #include "song.h" diff --git a/src/playlist_state.c b/src/playlist_state.c index b0cf961f7..ea8b7e4f9 100644 --- a/src/playlist_state.c +++ b/src/playlist_state.c @@ -22,6 +22,7 @@ * */ +#include "config.h" #include "playlist_state.h" #include "playlist.h" #include "player_control.h" diff --git a/src/poison.h b/src/poison.h index 5919c3cbe..ca6d73937 100644 --- a/src/poison.h +++ b/src/poison.h @@ -20,8 +20,9 @@ #ifndef MPD_POISON_H #define MPD_POISON_H +#include "check.h" + #ifndef NDEBUG -#include "config.h" #ifdef HAVE_VALGRIND_MEMCHECK_H #include <valgrind/memcheck.h> diff --git a/src/queue.c b/src/queue.c index c43d1c137..bd89544ca 100644 --- a/src/queue.c +++ b/src/queue.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "queue.h" #include "song.h" diff --git a/src/queue_print.c b/src/queue_print.c index 2ca9ccc34..4bc600aec 100644 --- a/src/queue_print.c +++ b/src/queue_print.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "queue_print.h" #include "queue.h" #include "song.h" diff --git a/src/queue_save.c b/src/queue_save.c index 9a5a0e30f..71b6a1526 100644 --- a/src/queue_save.c +++ b/src/queue_save.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "queue_save.h" #include "queue.h" #include "song.h" diff --git a/src/replay_gain.c b/src/replay_gain.c index 020671c8a..805d1e5c8 100644 --- a/src/replay_gain.c +++ b/src/replay_gain.c @@ -20,6 +20,7 @@ * (c)2004 replayGain code by AliasMrJones */ +#include "config.h" #include "replay_gain.h" #include "conf.h" #include "audio_format.h" diff --git a/src/sig_handlers.c b/src/sig_handlers.c index e70e1a159..028cd4038 100644 --- a/src/sig_handlers.c +++ b/src/sig_handlers.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "sig_handlers.h" #ifndef WIN32 diff --git a/src/socket_util.c b/src/socket_util.c index e737fdf06..bf8fe0f07 100644 --- a/src/socket_util.c +++ b/src/socket_util.c @@ -17,9 +17,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "socket_util.h" #include "fd_util.h" -#include "config.h" #include <errno.h> #include <unistd.h> diff --git a/src/song.c b/src/song.c index 942beb5d7..faaa208ca 100644 --- a/src/song.c +++ b/src/song.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "song.h" #include "uri.h" #include "directory.h" diff --git a/src/song_print.c b/src/song_print.c index 3420b0d34..3e6252ed6 100644 --- a/src/song_print.c +++ b/src/song_print.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "song_print.h" #include "song.h" #include "songvec.h" diff --git a/src/song_save.c b/src/song_save.c index 075fb6e7a..37df5067d 100644 --- a/src/song_save.c +++ b/src/song_save.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "song_save.h" #include "song.h" #include "tag_save.h" diff --git a/src/song_sticker.c b/src/song_sticker.c index 2758ff534..83131ba00 100644 --- a/src/song_sticker.c +++ b/src/song_sticker.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "song_sticker.h" #include "song.h" #include "directory.h" diff --git a/src/songvec.c b/src/songvec.c index f8f83e6e8..bdc90da32 100644 --- a/src/songvec.c +++ b/src/songvec.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "songvec.h" #include "song.h" #include "tag.h" diff --git a/src/state_file.c b/src/state_file.c index 4c7dab426..fd9832313 100644 --- a/src/state_file.c +++ b/src/state_file.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "state_file.h" #include "output_state.h" #include "playlist.h" diff --git a/src/stats.c b/src/stats.c index 303d23c8e..93e492387 100644 --- a/src/stats.c +++ b/src/stats.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "stats.h" #include "database.h" #include "tag.h" diff --git a/src/sticker.c b/src/sticker.c index 4135e6293..222ae05bc 100644 --- a/src/sticker.c +++ b/src/sticker.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "sticker.h" #include "idle.h" diff --git a/src/sticker_print.c b/src/sticker_print.c index 12dafd3f7..6bcc41d77 100644 --- a/src/sticker_print.c +++ b/src/sticker_print.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "sticker_print.h" #include "sticker.h" #include "client.h" diff --git a/src/stored_playlist.c b/src/stored_playlist.c index f283ab98b..14c9ac70a 100644 --- a/src/stored_playlist.c +++ b/src/stored_playlist.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "stored_playlist.h" #include "playlist_save.h" #include "song.h" diff --git a/src/strset.c b/src/strset.c index 474dd6642..0c911d5ac 100644 --- a/src/strset.c +++ b/src/strset.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "strset.h" #include <assert.h> @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "tag.h" #include "tag_internal.h" #include "tag_pool.h" diff --git a/src/tag_ape.c b/src/tag_ape.c index fb210ca46..d18cc84ee 100644 --- a/src/tag_ape.c +++ b/src/tag_ape.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "tag_ape.h" #include "tag.h" diff --git a/src/tag_id3.c b/src/tag_id3.c index ad19062bf..423a2aa92 100644 --- a/src/tag_id3.c +++ b/src/tag_id3.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "tag_id3.h" #include "tag.h" #include "riff.h" diff --git a/src/tag_id3.h b/src/tag_id3.h index 4f51a70b8..b32a834b5 100644 --- a/src/tag_id3.h +++ b/src/tag_id3.h @@ -20,7 +20,7 @@ #ifndef MPD_TAG_ID3_H #define MPD_TAG_ID3_H -#include "config.h" +#include "check.h" struct tag; diff --git a/src/tag_pool.c b/src/tag_pool.c index 6aef12941..25629ffb7 100644 --- a/src/tag_pool.c +++ b/src/tag_pool.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "tag_pool.h" #include <assert.h> diff --git a/src/tag_print.c b/src/tag_print.c index dddbbbe67..d3b84568e 100644 --- a/src/tag_print.c +++ b/src/tag_print.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "tag_print.h" #include "tag.h" #include "tag_internal.h" diff --git a/src/tag_save.c b/src/tag_save.c index fac948b9f..bd0ef7b76 100644 --- a/src/tag_save.c +++ b/src/tag_save.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "tag_save.h" #include "tag.h" #include "tag_internal.h" diff --git a/src/text_file.c b/src/text_file.c index 16698fc57..776e57023 100644 --- a/src/text_file.c +++ b/src/text_file.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "text_file.h" #include <assert.h> diff --git a/src/text_input_stream.c b/src/text_input_stream.c index ec81c9a27..fd402590e 100644 --- a/src/text_input_stream.c +++ b/src/text_input_stream.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "text_input_stream.h" #include "input_stream.h" #include "fifo_buffer.h" diff --git a/src/timer.c b/src/timer.c index d9a143bcc..39347bd57 100644 --- a/src/timer.c +++ b/src/timer.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "timer.h" #include "audio_format.h" diff --git a/src/tokenizer.c b/src/tokenizer.c index c1b64f959..52f847671 100644 --- a/src/tokenizer.c +++ b/src/tokenizer.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "tokenizer.h" #include <stdbool.h> diff --git a/src/update.c b/src/update.c index bbf80d4de..ee946f357 100644 --- a/src/update.c +++ b/src/update.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "update_internal.h" #include "update.h" #include "database.h" @@ -27,7 +28,6 @@ #include "idle.h" #include "stats.h" #include "main.h" -#include "config.h" #include <glib.h> diff --git a/src/update_queue.c b/src/update_queue.c index 60e752a62..be48f3043 100644 --- a/src/update_queue.c +++ b/src/update_queue.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "update_internal.h" #include <glib.h> @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "uri.h" #include <glib.h> diff --git a/src/utils.c b/src/utils.c index f8051a41d..0e9584d68 100644 --- a/src/utils.c +++ b/src/utils.c @@ -17,9 +17,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "utils.h" #include "conf.h" -#include "config.h" #include <glib.h> diff --git a/src/volume.c b/src/volume.c index 1be0705af..8a74e10ae 100644 --- a/src/volume.c +++ b/src/volume.c @@ -17,12 +17,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "volume.h" #include "conf.h" #include "player_control.h" #include "idle.h" #include "pcm_volume.h" -#include "config.h" #include "output_all.h" #include "mixer_control.h" #include "mixer_all.h" diff --git a/src/zeroconf-avahi.c b/src/zeroconf-avahi.c index 648f36e03..63ad0f65b 100644 --- a/src/zeroconf-avahi.c +++ b/src/zeroconf-avahi.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "zeroconf-internal.h" #include "listen.h" diff --git a/src/zeroconf-bonjour.c b/src/zeroconf-bonjour.c index 4e06319e7..41734d3bc 100644 --- a/src/zeroconf-bonjour.c +++ b/src/zeroconf-bonjour.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "zeroconf-internal.h" #include "listen.h" diff --git a/src/zeroconf.c b/src/zeroconf.c index 42e995c45..9a386d53c 100644 --- a/src/zeroconf.c +++ b/src/zeroconf.c @@ -17,10 +17,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "zeroconf.h" #include "zeroconf-internal.h" #include "conf.h" -#include "config.h" #include <glib.h> diff --git a/src/zeroconf.h b/src/zeroconf.h index 6a5934ed5..0aafbdef2 100644 --- a/src/zeroconf.h +++ b/src/zeroconf.h @@ -20,7 +20,7 @@ #ifndef MPD_ZEROCONF_H #define MPD_ZEROCONF_H -#include "config.h" +#include "check.h" #ifdef HAVE_ZEROCONF diff --git a/test/dump_playlist.c b/test/dump_playlist.c index d6e7f17c0..75baf6c87 100644 --- a/test/dump_playlist.c +++ b/test/dump_playlist.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "input_stream.h" #include "tag_pool.h" #include "tag_save.h" diff --git a/test/read_conf.c b/test/read_conf.c index 92fcbba99..45e4bea88 100644 --- a/test/read_conf.c +++ b/test/read_conf.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "conf.h" #include <glib.h> diff --git a/test/read_mixer.c b/test/read_mixer.c index 208503618..60a63da00 100644 --- a/test/read_mixer.c +++ b/test/read_mixer.c @@ -17,12 +17,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "mixer_control.h" #include "mixer_list.h" #include "filter_registry.h" #include "pcm_volume.h" #include "event_pipe.h" -#include "config.h" #include <glib.h> diff --git a/test/read_tags.c b/test/read_tags.c index d38183667..cde90dad7 100644 --- a/test/read_tags.c +++ b/test/read_tags.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "decoder_list.h" #include "decoder_api.h" #include "input_stream.h" @@ -24,7 +25,6 @@ #include "pcm_volume.h" #include "tag_ape.h" #include "tag_id3.h" -#include "config.h" #include "idle.h" #include <glib.h> diff --git a/test/run_decoder.c b/test/run_decoder.c index 3128c6121..7e0c582a2 100644 --- a/test/run_decoder.c +++ b/test/run_decoder.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "decoder_list.h" #include "decoder_api.h" #include "input_stream.h" diff --git a/test/run_encoder.c b/test/run_encoder.c index b953bcd9a..aaafd2e8f 100644 --- a/test/run_encoder.c +++ b/test/run_encoder.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "encoder_list.h" #include "encoder_plugin.h" #include "audio_format.h" diff --git a/test/run_filter.c b/test/run_filter.c index 3c4b76125..de5f9a925 100644 --- a/test/run_filter.c +++ b/test/run_filter.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "conf.h" #include "audio_parser.h" #include "audio_format.h" diff --git a/test/run_input.c b/test/run_input.c index 37c792b86..09cd6f6c6 100644 --- a/test/run_input.c +++ b/test/run_input.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "input_stream.h" #include "tag_pool.h" #include "tag_save.h" diff --git a/test/run_output.c b/test/run_output.c index 0e91bb3fd..36bff7721 100644 --- a/test/run_output.c +++ b/test/run_output.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "output_plugin.h" #include "output_internal.h" #include "output_control.h" diff --git a/test/software_volume.c b/test/software_volume.c index 5d551b1f3..a1cc1317a 100644 --- a/test/software_volume.c +++ b/test/software_volume.c @@ -23,6 +23,7 @@ * */ +#include "config.h" #include "pcm_volume.h" #include "audio_parser.h" #include "audio_format.h" |