From ad3a8b8b314e0bcd254e149d7a20c1455ecaf480 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 30 Aug 2023 18:22:59 +0200 Subject: [PATCH] reshuffle included files to include config.h as first config.h may contain defines like _FILE_OFFSET_BITS which influence the system wide include files (off_t types, open -> open64 function usage etc.). Related: https://github.com/alsa-project/alsa-lib/pull/333 Signed-off-by: Jaroslav Kysela --- aserver/aserver.c | 3 ++- include/aserver.h | 2 +- src/alisp/alisp.c | 11 ++++++----- src/confeval.c | 2 +- src/confmisc.c | 2 +- src/control/cards.c | 2 +- src/control/control.c | 2 +- src/control/control_ext.c | 4 ++-- src/control/control_hw.c | 2 +- src/control/control_remap.c | 2 +- src/control/ctlparse.c | 2 +- src/control/eld.c | 2 +- src/control/hcontrol.c | 2 +- src/control/tlv.c | 2 +- src/dlmisc.c | 2 +- src/error.c | 2 +- src/hwdep/hwdep.c | 2 +- src/hwdep/hwdep_hw.c | 2 +- src/hwdep/hwdep_local.h | 2 +- src/input.c | 2 +- src/mixer/mixer.c | 2 +- src/mixer/simple.c | 5 ++--- src/mixer/simple_abst.c | 4 ++-- src/mixer/simple_none.c | 5 ++--- src/names.c | 2 +- src/output.c | 2 +- src/pcm/interval.c | 2 +- src/pcm/mask.c | 1 + src/pcm/pcm.c | 2 +- src/pcm/pcm_adpcm.c | 3 +-- src/pcm/pcm_alaw.c | 2 +- src/pcm/pcm_copy.c | 2 +- src/pcm/pcm_dmix.c | 1 + src/pcm/pcm_file.c | 4 ++-- src/pcm/pcm_generic.c | 4 ++-- src/pcm/pcm_hw.c | 6 +++--- src/pcm/pcm_iec958.c | 3 +-- src/pcm/pcm_ladspa.c | 5 ++--- src/pcm/pcm_lfloat.c | 3 +-- src/pcm/pcm_linear.c | 3 +-- src/pcm/pcm_meter.c | 4 ++-- src/pcm/pcm_misc.c | 4 ++-- src/pcm/pcm_mmap.c | 3 +-- src/pcm/pcm_mulaw.c | 3 +-- src/pcm/pcm_multi.c | 4 ++-- src/pcm/pcm_null.c | 4 ++-- src/pcm/pcm_plugin.c | 2 +- src/pcm/pcm_rate.c | 5 ++--- src/pcm/pcm_rate_linear.c | 5 ++--- src/pcm/pcm_route.c | 5 ++--- src/pcm/pcm_share.c | 2 +- src/pcm/pcm_softvol.c | 5 ++--- src/rawmidi/rawmidi_hw.c | 1 + src/socket.c | 2 +- src/topology/builder.c | 1 - src/topology/channel.c | 1 - src/topology/ctl.c | 1 - src/topology/dapm.c | 1 - src/topology/data.c | 1 - src/topology/decoder.c | 1 - src/topology/elem.c | 1 - src/topology/log.c | 1 - src/topology/ops.c | 1 - src/topology/parser.c | 3 +-- src/topology/pcm.c | 1 - src/topology/save.c | 1 - src/topology/text.c | 1 - src/topology/tplg_local.h | 3 ++- test/audio_time.c | 2 +- test/chmap.c | 1 + test/control.c | 1 + test/latency.c | 1 + test/pcm.c | 2 ++ test/playmidi1.c | 2 ++ test/seq.c | 2 ++ test/timer.c | 1 + test/user-ctl-element-set.c | 1 + 77 files changed, 92 insertions(+), 101 deletions(-) diff --git a/aserver/aserver.c b/aserver/aserver.c index 71b8a3cb..1742f628 100644 --- a/aserver/aserver.c +++ b/aserver/aserver.c @@ -18,6 +18,8 @@ * */ +#include "aserver.h" + #include #include #include @@ -33,7 +35,6 @@ #include #include -#include "aserver.h" char *command; diff --git a/include/aserver.h b/include/aserver.h index 6fb9480c..ffddf2b4 100644 --- a/include/aserver.h +++ b/include/aserver.h @@ -18,9 +18,9 @@ * */ -#include #include "../src/pcm/pcm_local.h" #include "../src/control/control_local.h" +#include int snd_receive_fd(int sock, void *data, size_t len, int *fd); diff --git a/src/alisp/alisp.c b/src/alisp/alisp.c index 476d0d52..bb841119 100644 --- a/src/alisp/alisp.c +++ b/src/alisp/alisp.c @@ -21,6 +21,12 @@ * */ +#define alisp_seq_iterator alisp_object + +#include "local.h" +#include "alisp.h" +#include "alisp_local.h" + #include #include @@ -31,11 +37,6 @@ #include #include -#define alisp_seq_iterator alisp_object - -#include "local.h" -#include "alisp.h" -#include "alisp_local.h" struct alisp_object alsa_lisp_nil; struct alisp_object alsa_lisp_t; diff --git a/src/confeval.c b/src/confeval.c index 4a6f8c2e..a27ee1d1 100644 --- a/src/confeval.c +++ b/src/confeval.c @@ -31,12 +31,12 @@ * */ +#include "local.h" #include #include #include #include #include -#include "local.h" typedef long long value_type_t; diff --git a/src/confmisc.c b/src/confmisc.c index 64af96fa..b55d86f7 100644 --- a/src/confmisc.c +++ b/src/confmisc.c @@ -74,12 +74,12 @@ */ +#include "local.h" #include #include #include #include #include -#include "local.h" /** * \brief Gets the boolean value from the given ASCII string. diff --git a/src/control/cards.c b/src/control/cards.c index 6145ebcd..a93f10a4 100644 --- a/src/control/cards.c +++ b/src/control/cards.c @@ -25,6 +25,7 @@ * */ +#include "control_local.h" #include #include #include @@ -32,7 +33,6 @@ #include #include #include -#include "control_local.h" #ifndef DOC_HIDDEN #define SND_FILE_CONTROL ALSA_DEVICE_DIRECTORY "controlC%i" diff --git a/src/control/control.c b/src/control/control.c index ec01518e..fe23dfd9 100644 --- a/src/control/control.c +++ b/src/control/control.c @@ -185,6 +185,7 @@ in-kernel implementations utilize this feature for I/O operations. This is against the original design. */ +#include "control_local.h" #include #include #include @@ -196,7 +197,6 @@ against the original design. #include #include #include -#include "control_local.h" /** * \brief get identifier of CTL handle diff --git a/src/control/control_ext.c b/src/control/control_ext.c index cf154f85..09106df1 100644 --- a/src/control/control_ext.c +++ b/src/control/control_ext.c @@ -27,12 +27,12 @@ * */ +#include "control_local.h" +#include "control_external.h" #include #include #include #include -#include "control_local.h" -#include "control_external.h" #ifndef PIC /* entry for static linking */ diff --git a/src/control/control_hw.c b/src/control/control_hw.c index df76990b..d21ef226 100644 --- a/src/control/control_hw.c +++ b/src/control/control_hw.c @@ -26,6 +26,7 @@ * */ +#include "control_local.h" #include #include #include @@ -33,7 +34,6 @@ #include #include #include -#include "control_local.h" #ifndef PIC /* entry for static linking */ diff --git a/src/control/control_remap.c b/src/control/control_remap.c index 5bc56608..faf9a739 100644 --- a/src/control/control_remap.c +++ b/src/control/control_remap.c @@ -25,13 +25,13 @@ * */ +#include "control_local.h" #include #include #include #include #include #include -#include "control_local.h" #if 0 #define REMAP_DEBUG 1 diff --git a/src/control/ctlparse.c b/src/control/ctlparse.c index 3ed1c647..ecb5cf91 100644 --- a/src/control/ctlparse.c +++ b/src/control/ctlparse.c @@ -25,11 +25,11 @@ * */ +#include "control_local.h" #include #include #include #include -#include "control_local.h" /* Function to convert from percentage to volume. val = percentage */ diff --git a/src/control/eld.c b/src/control/eld.c index 7e826cb5..78dd4382 100644 --- a/src/control/eld.c +++ b/src/control/eld.c @@ -26,12 +26,12 @@ * */ +#include "control_local.h" #include #include #include #include #include -#include "control_local.h" static void __fill_eld_ctl_id(snd_ctl_elem_id_t *id, int dev, int subdev) { diff --git a/src/control/hcontrol.c b/src/control/hcontrol.c index ce3fec3e..204d2e50 100644 --- a/src/control/hcontrol.c +++ b/src/control/hcontrol.c @@ -42,13 +42,13 @@ to reduce overhead accessing the real controls in kernel drivers. */ +#include "control_local.h" #include #include #include #include #include #include -#include "control_local.h" #ifdef HAVE_LIBPTHREAD #include #endif diff --git a/src/control/tlv.c b/src/control/tlv.c index d5044eb5..3a2b731d 100644 --- a/src/control/tlv.c +++ b/src/control/tlv.c @@ -26,6 +26,7 @@ * */ +#include "control_local.h" #include #include #include @@ -33,7 +34,6 @@ #ifndef HAVE_SOFT_FLOAT #include #endif -#include "control_local.h" #ifndef DOC_HIDDEN /* convert to index of integer array */ diff --git a/src/dlmisc.c b/src/dlmisc.c index f64c716a..bc527f83 100644 --- a/src/dlmisc.c +++ b/src/dlmisc.c @@ -27,8 +27,8 @@ * */ -#include "list.h" #include "local.h" +#include "list.h" #ifdef HAVE_LIBPTHREAD #include #endif diff --git a/src/error.c b/src/error.c index 2e617f87..c06af7c7 100644 --- a/src/error.c +++ b/src/error.c @@ -28,11 +28,11 @@ * */ +#include "local.h" #include #include #include #include -#include "local.h" /** * Array of error codes in US ASCII. diff --git a/src/hwdep/hwdep.c b/src/hwdep/hwdep.c index c5b3513d..72f6f0d0 100644 --- a/src/hwdep/hwdep.c +++ b/src/hwdep/hwdep.c @@ -28,13 +28,13 @@ * */ +#include "hwdep_local.h" #include #include #include #include #include #include -#include "hwdep_local.h" static int snd_hwdep_open_conf(snd_hwdep_t **hwdep, const char *name, snd_config_t *hwdep_root, diff --git a/src/hwdep/hwdep_hw.c b/src/hwdep/hwdep_hw.c index 1d3cf8e1..0f28f23b 100644 --- a/src/hwdep/hwdep_hw.c +++ b/src/hwdep/hwdep_hw.c @@ -19,13 +19,13 @@ * */ +#include "hwdep_local.h" #include #include #include #include #include #include -#include "hwdep_local.h" #ifndef PIC /* entry for static linking */ diff --git a/src/hwdep/hwdep_local.h b/src/hwdep/hwdep_local.h index 6cc95b04..9424272c 100644 --- a/src/hwdep/hwdep_local.h +++ b/src/hwdep/hwdep_local.h @@ -19,10 +19,10 @@ * */ +#include "local.h" #include #include #include -#include "local.h" typedef struct { int (*close)(snd_hwdep_t *hwdep); diff --git a/src/input.c b/src/input.c index 35324f1f..aa1cef5f 100644 --- a/src/input.c +++ b/src/input.c @@ -27,11 +27,11 @@ * */ +#include "local.h" #include #include #include #include -#include "local.h" #ifndef DOC_HIDDEN diff --git a/src/mixer/mixer.c b/src/mixer/mixer.c index 7019d6f4..d6456278 100644 --- a/src/mixer/mixer.c +++ b/src/mixer/mixer.c @@ -39,13 +39,13 @@ This is an abstraction layer over the hcontrol layer. */ +#include "mixer_local.h" #include #include #include #include #include #include -#include "mixer_local.h" #ifndef DOC_HIDDEN typedef struct _snd_mixer_slave { diff --git a/src/mixer/simple.c b/src/mixer/simple.c index 571fa664..1ef2f975 100644 --- a/src/mixer/simple.c +++ b/src/mixer/simple.c @@ -29,6 +29,8 @@ * */ +#include "mixer_local.h" +#include "mixer_simple.h" #include #include #include @@ -36,9 +38,6 @@ #include #include #include -#include "config.h" -#include "mixer_local.h" -#include "mixer_simple.h" /** * \brief Register mixer simple element class diff --git a/src/mixer/simple_abst.c b/src/mixer/simple_abst.c index 4dcc4cc7..ffc92e86 100644 --- a/src/mixer/simple_abst.c +++ b/src/mixer/simple_abst.c @@ -27,6 +27,8 @@ * */ +#include "mixer_local.h" +#include "mixer_simple.h" #include #include #include @@ -35,8 +37,6 @@ #include #include #include -#include "mixer_local.h" -#include "mixer_simple.h" #ifndef DOC_HIDDEN diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c index 9b9f0000..846b0ca9 100644 --- a/src/mixer/simple_none.c +++ b/src/mixer/simple_none.c @@ -29,6 +29,8 @@ * */ +#include "local.h" +#include "mixer_simple.h" #include #include #include @@ -38,9 +40,6 @@ #include #include #include -#include "local.h" -#include "config.h" -#include "mixer_simple.h" #ifndef DOC_HIDDEN diff --git a/src/names.c b/src/names.c index d909a11d..922ef781 100644 --- a/src/names.c +++ b/src/names.c @@ -30,10 +30,10 @@ * */ +#include "local.h" #include #include #include -#include "local.h" /** * \brief This function is unimplemented. diff --git a/src/output.c b/src/output.c index 70e6d65d..0e402b51 100644 --- a/src/output.c +++ b/src/output.c @@ -27,11 +27,11 @@ * */ +#include "local.h" #include #include #include #include -#include "local.h" #ifndef DOC_HIDDEN typedef struct _snd_output_ops { diff --git a/src/pcm/interval.c b/src/pcm/interval.c index ef4c2ed9..719e5086 100644 --- a/src/pcm/interval.c +++ b/src/pcm/interval.c @@ -22,9 +22,9 @@ #define SND_INTERVAL_C #define SND_INTERVAL_INLINE +#include "pcm_local.h" #include #include -#include "pcm_local.h" static inline void div64_32(uint64_t *n, uint32_t d, uint32_t *rem) { diff --git a/src/pcm/mask.c b/src/pcm/mask.c index f85357ca..6bd218da 100644 --- a/src/pcm/mask.c +++ b/src/pcm/mask.c @@ -22,6 +22,7 @@ #define SND_MASK_C #define SND_MASK_INLINE +#include "config.h" #include #include #include "pcm_local.h" diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c index e55ad7f7..75ceab6e 100644 --- a/src/pcm/pcm.c +++ b/src/pcm/pcm.c @@ -658,6 +658,7 @@ playback devices. \example ../../test/latency.c */ +#include "pcm_local.h" #include #include #if HAVE_MALLOC_H @@ -669,7 +670,6 @@ playback devices. #include #include #include -#include "pcm_local.h" #ifndef DOC_HIDDEN /* return specific error codes for known bad PCM states */ diff --git a/src/pcm/pcm_adpcm.c b/src/pcm/pcm_adpcm.c index ed065318..efd41451 100644 --- a/src/pcm/pcm_adpcm.c +++ b/src/pcm/pcm_adpcm.c @@ -56,11 +56,10 @@ IMA compatibility project proceedings, Vol 2, Issue 2, May 1992. come across a good description of XA yet. */ -#include "bswap.h" #include "pcm_local.h" #include "pcm_plugin.h" - #include "plugin_ops.h" +#include "bswap.h" #ifndef PIC /* entry for static linking */ diff --git a/src/pcm/pcm_alaw.c b/src/pcm/pcm_alaw.c index 540ba25f..715b04c7 100644 --- a/src/pcm/pcm_alaw.c +++ b/src/pcm/pcm_alaw.c @@ -26,8 +26,8 @@ * */ -#include "bswap.h" #include "pcm_local.h" +#include "bswap.h" #include "pcm_plugin.h" #include "plugin_ops.h" diff --git a/src/pcm/pcm_copy.c b/src/pcm/pcm_copy.c index 4c099acd..1bf745d2 100644 --- a/src/pcm/pcm_copy.c +++ b/src/pcm/pcm_copy.c @@ -26,9 +26,9 @@ * */ -#include "bswap.h" #include "pcm_local.h" #include "pcm_plugin.h" +#include "bswap.h" #ifndef PIC /* entry for static linking */ diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c index b0d0a43e..7cd3c508 100644 --- a/src/pcm/pcm_dmix.c +++ b/src/pcm/pcm_dmix.c @@ -26,6 +26,7 @@ * */ +#include "config.h" #include #include #include diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c index 7709a554..90b3f3f5 100644 --- a/src/pcm/pcm_file.c +++ b/src/pcm/pcm_file.c @@ -26,11 +26,11 @@ * */ +#include "pcm_local.h" +#include "pcm_plugin.h" #include "bswap.h" #include #include -#include "pcm_local.h" -#include "pcm_plugin.h" #ifndef PIC /* entry for static linking */ diff --git a/src/pcm/pcm_generic.c b/src/pcm/pcm_generic.c index 4a10c6b4..8177adc7 100644 --- a/src/pcm/pcm_generic.c +++ b/src/pcm/pcm_generic.c @@ -26,10 +26,10 @@ * */ -#include -#include #include "pcm_local.h" #include "pcm_generic.h" +#include +#include #ifndef DOC_HIDDEN diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c index f488023a..bd3ecfc9 100644 --- a/src/pcm/pcm_hw.c +++ b/src/pcm/pcm_hw.c @@ -27,6 +27,9 @@ * */ +#include "pcm_local.h" +#include "../control/control_local.h" +#include "../timer/timer_local.h" #include #include #include @@ -37,9 +40,6 @@ #include #include #include -#include "pcm_local.h" -#include "../control/control_local.h" -#include "../timer/timer_local.h" //#define DEBUG_RW /* use to debug readi/writei/readn/writen */ //#define DEBUG_MMAP /* debug mmap_commit */ diff --git a/src/pcm/pcm_iec958.c b/src/pcm/pcm_iec958.c index a11a0439..7b8459fb 100644 --- a/src/pcm/pcm_iec958.c +++ b/src/pcm/pcm_iec958.c @@ -26,11 +26,10 @@ * */ -#include "bswap.h" #include "pcm_local.h" #include "pcm_plugin.h" - #include "plugin_ops.h" +#include "bswap.h" #ifndef PIC /* entry for static linking */ diff --git a/src/pcm/pcm_ladspa.c b/src/pcm/pcm_ladspa.c index 9b2b32d7..56ee138f 100644 --- a/src/pcm/pcm_ladspa.c +++ b/src/pcm/pcm_ladspa.c @@ -32,12 +32,11 @@ * http://www.medianet.ag */ -#include "config.h" +#include "pcm_local.h" +#include "pcm_plugin.h" #include #include #include -#include "pcm_local.h" -#include "pcm_plugin.h" #include "ladspa.h" diff --git a/src/pcm/pcm_lfloat.c b/src/pcm/pcm_lfloat.c index f32a82a7..d9aa136d 100644 --- a/src/pcm/pcm_lfloat.c +++ b/src/pcm/pcm_lfloat.c @@ -26,11 +26,10 @@ * */ -#include "bswap.h" #include "pcm_local.h" #include "pcm_plugin.h" - #include "plugin_ops.h" +#include "bswap.h" #ifndef DOC_HIDDEN diff --git a/src/pcm/pcm_linear.c b/src/pcm/pcm_linear.c index 33e7fc45..81edccaa 100644 --- a/src/pcm/pcm_linear.c +++ b/src/pcm/pcm_linear.c @@ -26,11 +26,10 @@ * */ -#include "bswap.h" #include "pcm_local.h" #include "pcm_plugin.h" - #include "plugin_ops.h" +#include "bswap.h" #ifndef PIC /* entry for static linking */ diff --git a/src/pcm/pcm_meter.c b/src/pcm/pcm_meter.c index 2dcf8e45..18d921cc 100644 --- a/src/pcm/pcm_meter.c +++ b/src/pcm/pcm_meter.c @@ -27,12 +27,12 @@ */ +#include "pcm_local.h" +#include "pcm_plugin.h" #include "bswap.h" #include #include #include -#include "pcm_local.h" -#include "pcm_plugin.h" #define atomic_read(ptr) __atomic_load_n(ptr, __ATOMIC_SEQ_CST ) #define atomic_add(ptr, n) __atomic_add_fetch(ptr, n, __ATOMIC_SEQ_CST) diff --git a/src/pcm/pcm_misc.c b/src/pcm/pcm_misc.c index ce8d8189..04b13125 100644 --- a/src/pcm/pcm_misc.c +++ b/src/pcm/pcm_misc.c @@ -19,12 +19,12 @@ * */ +#include "pcm_local.h" +#include "bswap.h" #include #include #include #include -#include "bswap.h" -#include "pcm_local.h" /** diff --git a/src/pcm/pcm_mmap.c b/src/pcm/pcm_mmap.c index dcd5c77e..0b62978e 100644 --- a/src/pcm/pcm_mmap.c +++ b/src/pcm/pcm_mmap.c @@ -18,7 +18,7 @@ * */ -#include "config.h" +#include "pcm_local.h" #include #if HAVE_MALLOC_H #include @@ -29,7 +29,6 @@ #ifdef HAVE_SYS_SHM_H #include #endif -#include "pcm_local.h" void snd_pcm_mmap_appl_backward(snd_pcm_t *pcm, snd_pcm_uframes_t frames) { diff --git a/src/pcm/pcm_mulaw.c b/src/pcm/pcm_mulaw.c index 73b0c3bc..177a61bb 100644 --- a/src/pcm/pcm_mulaw.c +++ b/src/pcm/pcm_mulaw.c @@ -26,11 +26,10 @@ * */ -#include "bswap.h" #include "pcm_local.h" #include "pcm_plugin.h" - #include "plugin_ops.h" +#include "bswap.h" #ifndef PIC /* entry for static linking */ diff --git a/src/pcm/pcm_multi.c b/src/pcm/pcm_multi.c index 3680fd03..74e1e3f1 100644 --- a/src/pcm/pcm_multi.c +++ b/src/pcm/pcm_multi.c @@ -26,13 +26,13 @@ * */ +#include "pcm_local.h" +#include "pcm_generic.h" #include #include #include #include #include -#include "pcm_local.h" -#include "pcm_generic.h" #ifndef PIC /* entry for static linking */ diff --git a/src/pcm/pcm_null.c b/src/pcm/pcm_null.c index c8ea9b38..f7b096bc 100644 --- a/src/pcm/pcm_null.c +++ b/src/pcm/pcm_null.c @@ -26,10 +26,10 @@ * */ -#include "bswap.h" -#include #include "pcm_local.h" #include "pcm_plugin.h" +#include "bswap.h" +#include #ifndef PIC /* entry for static linking */ diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c index b3af1fb7..9d7e233e 100644 --- a/src/pcm/pcm_plugin.c +++ b/src/pcm/pcm_plugin.c @@ -82,9 +82,9 @@ pcm.rate44100Hz { */ -#include #include "pcm_local.h" #include "pcm_plugin.h" +#include #ifndef DOC_HIDDEN diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c index 44d7e760..ef6b8006 100644 --- a/src/pcm/pcm_rate.c +++ b/src/pcm/pcm_rate.c @@ -27,13 +27,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ -#include -#include "bswap.h" #include "pcm_local.h" #include "pcm_plugin.h" #include "pcm_rate.h" - #include "plugin_ops.h" +#include "bswap.h" +#include #if 0 #define DEBUG_REFINE diff --git a/src/pcm/pcm_rate_linear.c b/src/pcm/pcm_rate_linear.c index 53ce902d..35a4d8ea 100644 --- a/src/pcm/pcm_rate_linear.c +++ b/src/pcm/pcm_rate_linear.c @@ -20,13 +20,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include "bswap.h" #include "pcm_local.h" #include "pcm_plugin.h" #include "pcm_rate.h" - #include "plugin_ops.h" +#include "bswap.h" +#include /* LINEAR_DIV needs to be large enough to handle resampling from 768000 -> 8000 */ diff --git a/src/pcm/pcm_route.c b/src/pcm/pcm_route.c index 21b869cc..94292fc7 100644 --- a/src/pcm/pcm_route.c +++ b/src/pcm/pcm_route.c @@ -26,12 +26,11 @@ * */ -#include "bswap.h" -#include #include "pcm_local.h" #include "pcm_plugin.h" - #include "plugin_ops.h" +#include "bswap.h" +#include #ifndef PIC /* entry for static linking */ diff --git a/src/pcm/pcm_share.c b/src/pcm/pcm_share.c index 677f4132..0699fc87 100644 --- a/src/pcm/pcm_share.c +++ b/src/pcm/pcm_share.c @@ -26,6 +26,7 @@ * */ +#include "pcm_local.h" #include #include #include @@ -36,7 +37,6 @@ #include #include #include -#include "pcm_local.h" #ifndef PIC /* entry for static linking */ diff --git a/src/pcm/pcm_softvol.c b/src/pcm/pcm_softvol.c index 3e3dbc79..75f2aa0a 100644 --- a/src/pcm/pcm_softvol.c +++ b/src/pcm/pcm_softvol.c @@ -26,11 +26,10 @@ * */ -#include "bswap.h" -#include #include "pcm_local.h" #include "pcm_plugin.h" - +#include "bswap.h" +#include #include #ifndef PIC diff --git a/src/rawmidi/rawmidi_hw.c b/src/rawmidi/rawmidi_hw.c index cc4ffd8e..3b1d941e 100644 --- a/src/rawmidi/rawmidi_hw.c +++ b/src/rawmidi/rawmidi_hw.c @@ -20,6 +20,7 @@ * */ +#include "config.h" #include #include #include diff --git a/src/socket.c b/src/socket.c index 99da23e7..c68fa300 100644 --- a/src/socket.c +++ b/src/socket.c @@ -25,6 +25,7 @@ * */ +#include "local.h" #include #include #include @@ -37,7 +38,6 @@ #include #include #include -#include "local.h" #ifndef DOC_HIDDEN int snd_send_fd(int sock, void *data, size_t len, int fd) diff --git a/src/topology/builder.c b/src/topology/builder.c index f8aba830..9c52c9cc 100644 --- a/src/topology/builder.c +++ b/src/topology/builder.c @@ -17,7 +17,6 @@ Liam Girdwood */ -#include "list.h" #include "tplg_local.h" /* write a block, track the position */ diff --git a/src/topology/channel.c b/src/topology/channel.c index ebdff469..9239c3b2 100644 --- a/src/topology/channel.c +++ b/src/topology/channel.c @@ -17,7 +17,6 @@ Liam Girdwood */ -#include "list.h" #include "tplg_local.h" /* mapping of channel text names to types */ diff --git a/src/topology/ctl.c b/src/topology/ctl.c index dd05424d..04f39d77 100644 --- a/src/topology/ctl.c +++ b/src/topology/ctl.c @@ -17,7 +17,6 @@ Liam Girdwood */ -#include "list.h" #include "tplg_local.h" #define ENUM_VAL_SIZE (SNDRV_CTL_ELEM_ID_NAME_MAXLEN >> 2) diff --git a/src/topology/dapm.c b/src/topology/dapm.c index 1c15ce8a..55bb2fab 100644 --- a/src/topology/dapm.c +++ b/src/topology/dapm.c @@ -17,7 +17,6 @@ Liam Girdwood */ -#include "list.h" #include "tplg_local.h" /* mapping of widget text names to types */ diff --git a/src/topology/data.c b/src/topology/data.c index 972b4b7a..2f077d36 100644 --- a/src/topology/data.c +++ b/src/topology/data.c @@ -17,7 +17,6 @@ Liam Girdwood */ -#include "list.h" #include "tplg_local.h" #include diff --git a/src/topology/decoder.c b/src/topology/decoder.c index 66ebe5d8..c8df7e35 100644 --- a/src/topology/decoder.c +++ b/src/topology/decoder.c @@ -15,7 +15,6 @@ Authors: Jaroslav Kysela */ -#include "list.h" #include "tplg_local.h" int tplg_decode_template(snd_tplg_t *tplg, diff --git a/src/topology/elem.c b/src/topology/elem.c index cbd7f4b6..a7a7241d 100644 --- a/src/topology/elem.c +++ b/src/topology/elem.c @@ -17,7 +17,6 @@ Liam Girdwood */ -#include "list.h" #include "tplg_local.h" struct tplg_table tplg_table[] = { diff --git a/src/topology/log.c b/src/topology/log.c index 1ca36528..b06e0898 100644 --- a/src/topology/log.c +++ b/src/topology/log.c @@ -15,7 +15,6 @@ Authors: Jaroslav Kysela */ -#include "list.h" #include "tplg_local.h" /* verbose output detailing each object size and file position */ diff --git a/src/topology/ops.c b/src/topology/ops.c index daab3577..74f7cbab 100644 --- a/src/topology/ops.c +++ b/src/topology/ops.c @@ -17,7 +17,6 @@ Liam Girdwood */ -#include "list.h" #include "tplg_local.h" /* mapping of kcontrol text names to types */ diff --git a/src/topology/parser.c b/src/topology/parser.c index e70173f6..874ec524 100644 --- a/src/topology/parser.c +++ b/src/topology/parser.c @@ -17,9 +17,8 @@ Liam Girdwood */ -#include -#include "list.h" #include "tplg_local.h" +#include /* * Get integer value diff --git a/src/topology/pcm.c b/src/topology/pcm.c index 4de1d266..539f258d 100644 --- a/src/topology/pcm.c +++ b/src/topology/pcm.c @@ -17,7 +17,6 @@ Liam Girdwood */ -#include "list.h" #include "tplg_local.h" #define RATE(v) [SND_PCM_RATE_##v] = #v diff --git a/src/topology/save.c b/src/topology/save.c index fecbc6a5..59f4759b 100644 --- a/src/topology/save.c +++ b/src/topology/save.c @@ -15,7 +15,6 @@ Authors: Jaroslav Kysela */ -#include "list.h" #include "tplg_local.h" #define SAVE_ALLOC_SHIFT (13) /* 8192 bytes */ diff --git a/src/topology/text.c b/src/topology/text.c index b07feb99..47abb8d8 100644 --- a/src/topology/text.c +++ b/src/topology/text.c @@ -18,7 +18,6 @@ */ -#include "list.h" #include "tplg_local.h" #define TEXT_SIZE_MAX \ diff --git a/src/topology/tplg_local.h b/src/topology/tplg_local.h index 1cb8b694..63639274 100644 --- a/src/topology/tplg_local.h +++ b/src/topology/tplg_local.h @@ -10,11 +10,12 @@ * Lesser General Public License for more details. */ +#include "local.h" + #include #include #include -#include "local.h" #include "list.h" #include "bswap.h" #include "topology.h" diff --git a/test/audio_time.c b/test/audio_time.c index 1c8481be..00619966 100644 --- a/test/audio_time.c +++ b/test/audio_time.c @@ -4,7 +4,7 @@ * helpful to verify the information reported by drivers. */ -#include "../include/config.h" +#include "config.h" #include #if HAVE_MALLOC_H #include diff --git a/test/chmap.c b/test/chmap.c index ad3b305b..52f29a76 100644 --- a/test/chmap.c +++ b/test/chmap.c @@ -2,6 +2,7 @@ * channel mapping API test program */ +#include "config.h" #include #include #include diff --git a/test/control.c b/test/control.c index f4b437ee..b0a3877e 100644 --- a/test/control.c +++ b/test/control.c @@ -1,3 +1,4 @@ +#include "config.h" #include #include #include "../include/asoundlib.h" diff --git a/test/latency.c b/test/latency.c index 40c63e24..ae37c11a 100644 --- a/test/latency.c +++ b/test/latency.c @@ -27,6 +27,7 @@ * */ +#include "config.h" #include #include #include diff --git a/test/pcm.c b/test/pcm.c index 0484ea39..223edafc 100644 --- a/test/pcm.c +++ b/test/pcm.c @@ -2,6 +2,8 @@ * This small demo sends a simple sinusoidal wave to your speakers. */ +#include "config.h" + #include #include #include diff --git a/test/playmidi1.c b/test/playmidi1.c index f178279a..831e9578 100644 --- a/test/playmidi1.c +++ b/test/playmidi1.c @@ -34,6 +34,8 @@ * */ +#include "config.h" + #include #include #include diff --git a/test/seq.c b/test/seq.c index 34b000fd..04f7e5d4 100644 --- a/test/seq.c +++ b/test/seq.c @@ -1,3 +1,5 @@ +#include "config.h" + #include #include #include diff --git a/test/timer.c b/test/timer.c index b05eb2f0..63ea4a54 100644 --- a/test/timer.c +++ b/test/timer.c @@ -1,3 +1,4 @@ +#include "config.h" #include #include #include diff --git a/test/user-ctl-element-set.c b/test/user-ctl-element-set.c index fee130e2..ceccdba7 100644 --- a/test/user-ctl-element-set.c +++ b/test/user-ctl-element-set.c @@ -7,6 +7,7 @@ * Licensed under the terms of the GNU General Public License, version 2. */ +#include "config.h" #include "../include/asoundlib.h" #include #include -- 2.47.1