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 <perex@perex.cz>

diff --git a/aserver/aserver.c b/aserver/aserver.c
index 71b8a3cbfeab2af2d7423216e7a36843267c3b42..1742f628e55393199588e77739014e5cc3fcfb5b 100644 (file)
--- a/aserver/aserver.c
+++ b/aserver/aserver.c
@@ -18,6 +18,8 @@
  *
  */
 
+#include "aserver.h"
+
 #include <sys/shm.h>
 #include <sys/socket.h>
 #include <poll.h>
@@ -33,7 +35,6 @@
 #include <limits.h>
 #include <signal.h>
 
-#include "aserver.h"
 
 char *command;
 

diff --git a/include/aserver.h b/include/aserver.h
index 6fb9480ca838afd7bae5a959cde5af86ad33c102..ffddf2b43cda03b1538de0a4ead597651952aa40 100644 (file)
--- a/include/aserver.h
+++ b/include/aserver.h
@@ -18,9 +18,9 @@
  *
  */
   
-#include <netdb.h>
 #include "../src/pcm/pcm_local.h"
 #include "../src/control/control_local.h"
+#include <netdb.h>
 
 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 476d0d52aac3bec6776e2e90b2bc5b7bb9dbb4bb..bb841119071d9d28c751911fe78c650240b812aa 100644 (file)
--- 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 <assert.h>
 
 #include <limits.h>
@@ -31,11 +37,6 @@
 #include <math.h>
 #include <err.h>
 
-#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 4a6f8c2e3a15d5d074b4e7e6bd7d01f3032fa2e9..a27ee1d139c978d7e4e4c34db07b4316fd1fff47 100644 (file)
--- a/src/confeval.c
+++ b/src/confeval.c
@@ -31,12 +31,12 @@
  *
  */
 
+#include "local.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 #include <limits.h>
-#include "local.h"
 
 typedef long long value_type_t;
 

diff --git a/src/confmisc.c b/src/confmisc.c
index 64af96fa6cf91379db8ebf4d02e701eb5058e20d..b55d86f754b4632d51e9383f3d54e784df878ca7 100644 (file)
--- a/src/confmisc.c
+++ b/src/confmisc.c
@@ -74,12 +74,12 @@
 */
 
 
+#include "local.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 #include <limits.h>
-#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 6145ebcd95295a21ad049a783cf973c1d53f9b80..a93f10a47021d262e781154bf2606a167a698b57 100644 (file)
--- a/src/control/cards.c
+++ b/src/control/cards.c
@@ -25,6 +25,7 @@
  *
  */
 
+#include "control_local.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -32,7 +33,6 @@
 #include <ctype.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#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 ec01518e67f771148ada43ea1e6c0c4f98ab2503..fe23dfd935bc0266e1cf7c983ef7ba547ef02818 100644 (file)
--- 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 <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -196,7 +197,6 @@ against the original design.
 #include <poll.h>
 #include <stdbool.h>
 #include <limits.h>
-#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 cf154f85c5320f1d6901a2cc9e8a28557bfbcb13..09106df143ef1d0b30ee2a60d590a7ef719b2689 100644 (file)
--- 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 <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#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 df76990b98e750046769a9ffe0bba59798e2b260..d21ef226b117c31bd09593dca3243696aae30172 100644 (file)
--- a/src/control/control_hw.c
+++ b/src/control/control_hw.c
@@ -26,6 +26,7 @@
  *
  */
 
+#include "control_local.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -33,7 +34,6 @@
 #include <string.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#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 5bc566087ed5df79c27319cef793da5cb84e726d..faf9a73982d6021828730ae041be67d0a79edb9b 100644 (file)
--- a/src/control/control_remap.c
+++ b/src/control/control_remap.c
@@ -25,13 +25,13 @@
  *
  */
 
+#include "control_local.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdarg.h>
 #include <unistd.h>
 #include <string.h>
-#include "control_local.h"
 
 #if 0
 #define REMAP_DEBUG 1

diff --git a/src/control/ctlparse.c b/src/control/ctlparse.c
index 3ed1c6475bb7f337b7a8b8d95efdb26e6e8c1888..ecb5cf91735c9f5c19cc02b261a49ddfb160cbe0 100644 (file)
--- a/src/control/ctlparse.c
+++ b/src/control/ctlparse.c
@@ -25,11 +25,11 @@
  *
  */
 
+#include "control_local.h"
 #include <unistd.h>
 #include <string.h>
 #include <ctype.h>
 #include <math.h>
-#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 7e826cb5da2ee5a3cd36ffad60d6bbaa3c5f019b..78dd43829bc8b22f9596b6b005f5ac3b76bf0d41 100644 (file)
--- a/src/control/eld.c
+++ b/src/control/eld.c
@@ -26,12 +26,12 @@
  *
  */
 
+#include "control_local.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <ctype.h>
-#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 ce3fec3e06fe1ec30108a174d101f964419e95e0..204d2e506c32d9172394ab434011b4f1835a2235 100644 (file)
--- 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 <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include "control_local.h"
 #ifdef HAVE_LIBPTHREAD
 #include <pthread.h>
 #endif

diff --git a/src/control/tlv.c b/src/control/tlv.c
index d5044eb573ad88b648fa3540e8abbf6f14b8851f..3a2b731df53fb1cce47bdfce8bd9d1cc7b91fa47 100644 (file)
--- a/src/control/tlv.c
+++ b/src/control/tlv.c
@@ -26,6 +26,7 @@
  *
  */
 
+#include "control_local.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -33,7 +34,6 @@
 #ifndef HAVE_SOFT_FLOAT
 #include <math.h>
 #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 f64c716af73da7193179f21455d1e6c7e59ddcaa..bc527f839e4e752150cf52024378477a458c026a 100644 (file)
--- 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 <pthread.h>
 #endif

diff --git a/src/error.c b/src/error.c
index 2e617f87a7cf91ab437d8123f9525cb35b972a6c..c06af7c7f7e58513f681b506122312cb4831a857 100644 (file)
--- a/src/error.c
+++ b/src/error.c
@@ -28,11 +28,11 @@
  *
  */
 
+#include "local.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-#include "local.h"
 
 /**
  * Array of error codes in US ASCII.

diff --git a/src/hwdep/hwdep.c b/src/hwdep/hwdep.c
index c5b3513da647b001af964494cb3c61ae825d7228..72f6f0d0c4139ab8c9a275075770aeb83c517066 100644 (file)
--- a/src/hwdep/hwdep.c
+++ b/src/hwdep/hwdep.c
@@ -28,13 +28,13 @@
  *
  */
 
+#include "hwdep_local.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#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 1d3cf8e1e6c97ca7ecb5bd638cd5eecfcf43a1ab..0f28f23be346b5d85b7971a3f7fedc220a5cd4c0 100644 (file)
--- a/src/hwdep/hwdep_hw.c
+++ b/src/hwdep/hwdep_hw.c
@@ -19,13 +19,13 @@
  *
  */
 
+#include "hwdep_local.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#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 6cc95b04a46a1a239cfc1decf63b5bb5ad02e48a..9424272cbca064d71cfdb351a822b0ee2c253865 100644 (file)
--- a/src/hwdep/hwdep_local.h
+++ b/src/hwdep/hwdep_local.h
@@ -19,10 +19,10 @@
  *
  */
 
+#include "local.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
-#include "local.h"
 
 typedef struct {
        int (*close)(snd_hwdep_t *hwdep);

diff --git a/src/input.c b/src/input.c
index 35324f1f3a173e4c6ffe0a73d1758f8f4d547f51..aa1cef5f838cd339faa454849cb1ca294127d0ec 100644 (file)
--- a/src/input.c
+++ b/src/input.c
@@ -27,11 +27,11 @@
  *
  */
 
+#include "local.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include "local.h"
 
 #ifndef DOC_HIDDEN
 

diff --git a/src/mixer/mixer.c b/src/mixer/mixer.c
index 7019d6f4653ca3cb4838b75131dc6ab346ac7d34..d6456278953b64b0ce02e3a4f5a4135886e5d2b0 100644 (file)
--- 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 <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#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 571fa664d41cb641db826de88da20a2c92e6225c..1ef2f975b5517782b9fb6705ed6341672603e979 100644 (file)
--- a/src/mixer/simple.c
+++ b/src/mixer/simple.c
@@ -29,6 +29,8 @@
  *
  */
 
+#include "mixer_local.h"
+#include "mixer_simple.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -36,9 +38,6 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <math.h>
-#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 4dcc4cc7e35ae4ff8dd0b5972dc12506ab6391d1..ffc92e86ff131de289958894b134edd256ea5605 100644 (file)
--- 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 <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -35,8 +37,6 @@
 #include <sys/ioctl.h>
 #include <math.h>
 #include <dlfcn.h>
-#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 9b9f00005724d7092410d69f3cf1b335247f8f14..846b0ca92467eac8f33b7e76757ca52002c60095 100644 (file)
--- a/src/mixer/simple_none.c
+++ b/src/mixer/simple_none.c
@@ -29,6 +29,8 @@
  *
  */
 
+#include "local.h"
+#include "mixer_simple.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -38,9 +40,6 @@
 #include <assert.h>
 #include <math.h>
 #include <limits.h>
-#include "local.h"
-#include "config.h"
-#include "mixer_simple.h"
 
 #ifndef DOC_HIDDEN
 

diff --git a/src/names.c b/src/names.c
index d909a11dcd85c0dcc67684373a7387116f2efcda..922ef781a9102567717f4f6e427d70fb11704aa8 100644 (file)
--- a/src/names.c
+++ b/src/names.c
@@ -30,10 +30,10 @@
  *
  */
 
+#include "local.h"
 #include <stdarg.h>
 #include <limits.h>
 #include <sys/stat.h>
-#include "local.h"
 
 /** 
  * \brief This function is unimplemented.

diff --git a/src/output.c b/src/output.c
index 70e6d65d84e7edfdcb7dcc8e35a2042d5676d99c..0e402b519eb7519856c8e5cca44c032e92b864b8 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -27,11 +27,11 @@
  *
  */
 
+#include "local.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include "local.h"
 
 #ifndef DOC_HIDDEN
 typedef struct _snd_output_ops {

diff --git a/src/pcm/interval.c b/src/pcm/interval.c
index ef4c2ed98e96524272a64b265b7b784139647f4d..719e5086b26296076906b2bafa8f0a61c293b5db 100644 (file)
--- 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 <sys/types.h>
 #include <limits.h>
-#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 f85357ca478408d23a43ecbb5a1e66e8a175a32e..6bd218da702b0bf9b3de55dcaebfe827e948ffac 100644 (file)
--- 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 <sys/types.h>
 #include <limits.h>
 #include "pcm_local.h"

diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
index e55ad7f7cbb07223213695854519979abf9aa42b..75ceab6e6353a1b49f9e3ab86ac355824501af61 100644 (file)
--- 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 <stdio.h>
 #include <string.h>
 #if HAVE_MALLOC_H
@@ -669,7 +670,6 @@ playback devices.
 #include <poll.h>
 #include <sys/mman.h>
 #include <limits.h>
-#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 ed065318f01e26f294635060708c2e6850fd5b56..efd4145170a7c3bbd103b63530248e994aac6bc0 100644 (file)
--- 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 540ba25f9fffe62e515108c0dfe8de18ac7cfb9d..715b04c74f0f5110f6c76a6de7e6f48b3eb83dd0 100644 (file)
--- 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 4c099acd577c8896945058c5c6a60b688f806884..1bf745d2bea9097d01fa3587c5815e6e374088d2 100644 (file)
--- 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 b0d0a43e463651451b58e1ad6872be4f49f9b128..7cd3c50841ae219c65731f7cb5ab32a1edcd99a3 100644 (file)
--- a/src/pcm/pcm_dmix.c
+++ b/src/pcm/pcm_dmix.c
@@ -26,6 +26,7 @@
  *
  */
   
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>

diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c
index 7709a5549dbe18cb3b4f37e865ee997d2481e724..90b3f3f568ceca67d1faf99b80a4b25b556e49df 100644 (file)
--- 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 <ctype.h>
 #include <string.h>
-#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 4a10c6b40e7866e6f366705ca8e4ab914483913e..8177adc73568e4a748db64db6c38ebaa8b39171a 100644 (file)
--- a/src/pcm/pcm_generic.c
+++ b/src/pcm/pcm_generic.c
@@ -26,10 +26,10 @@
  *
  */
 
-#include <sys/ioctl.h>
-#include <limits.h>
 #include "pcm_local.h"
 #include "pcm_generic.h"
+#include <sys/ioctl.h>
+#include <limits.h>
 
 #ifndef DOC_HIDDEN
 

diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c
index f488023a14a814041aea8d4768f70b66bbfeb4fc..bd3ecfc942d1a3e98ce3ca402e9731ba7725995a 100644 (file)
--- 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 <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
@@ -37,9 +40,6 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
-#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 a11a043924f6c7d72911c51cd1ddc702ec8d407b..7b8459fbe0701efd6dbd5564adc25ac648b08bf1 100644 (file)
--- 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 9b2b32d7515a40ed6419f265b1886126858d866f..56ee138f90f49c968d51aeb4982e64e9c6d546d9 100644 (file)
--- 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 <dirent.h>
 #include <locale.h>
 #include <math.h>
-#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 f32a82a7037b13be8806600185c5ff2847951cc6..d9aa136d10e7810610a878a281536a9d19a31d61 100644 (file)
--- 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 33e7fc4578f3f0f5062f908ae4b67e98965f64ce..81edccaaccc7931199fb7c08b70d0c59ed682a8f 100644 (file)
--- 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 2dcf8e45b4d00643aab05cf492874db7642ff8ba..18d921ccb518053475c6708fbfe0ec62b11bc30e 100644 (file)
--- 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 <time.h>
 #include <pthread.h>
 #include <dlfcn.h>
-#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 ce8d8189aee278031951ac910c9f39c388e31f70..04b131259e7c81f80cf47d05c02caf541e4b847d 100644 (file)
--- a/src/pcm/pcm_misc.c
+++ b/src/pcm/pcm_misc.c
@@ -19,12 +19,12 @@
  *
  */
   
+#include "pcm_local.h"
+#include "bswap.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include "bswap.h"
-#include "pcm_local.h"
 
 
 /**

diff --git a/src/pcm/pcm_mmap.c b/src/pcm/pcm_mmap.c
index dcd5c77e20e4fa2f249021b921f4929489b95cfd..0b62978e47eacefb41006583a5b1034603d36f71 100644 (file)
--- a/src/pcm/pcm_mmap.c
+++ b/src/pcm/pcm_mmap.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "config.h"
+#include "pcm_local.h"
 #include <stdio.h>
 #if HAVE_MALLOC_H
 #include <malloc.h>
@@ -29,7 +29,6 @@
 #ifdef HAVE_SYS_SHM_H
 #include <sys/shm.h>
 #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 73b0c3bcdf354aeeb47548bc954f619f90a77ebe..177a61bb02d1508972444e76b775cd110f430aee 100644 (file)
--- 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 3680fd03f745bec88b3a149015c3fe8d3bdf4dde..74e1e3f144564f9566e697cad5c6f39df854296c 100644 (file)
--- 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 <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <math.h>
-#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 c8ea9b38785f3c65d15501fb7403b273f7113050..f7b096bcd4b89a0c2e6cd44fa6b54e7bb8c593b7 100644 (file)
--- a/src/pcm/pcm_null.c
+++ b/src/pcm/pcm_null.c
@@ -26,10 +26,10 @@
  *
  */
   
-#include "bswap.h"
-#include <limits.h>
 #include "pcm_local.h"
 #include "pcm_plugin.h"
+#include "bswap.h"
+#include <limits.h>
 
 #ifndef PIC
 /* entry for static linking */

diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c
index b3af1fb775035b3e253a16227fd380adc75bc5c7..9d7e233e84379b6b01a3dae85293714fbcdd2949 100644 (file)
--- a/src/pcm/pcm_plugin.c
+++ b/src/pcm/pcm_plugin.c
@@ -82,9 +82,9 @@ pcm.rate44100Hz {
 
 */
   
-#include <limits.h>
 #include "pcm_local.h"
 #include "pcm_plugin.h"
+#include <limits.h>
 
 #ifndef DOC_HIDDEN
 

diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c
index 44d7e760b3eebedeb1d091d5a857ccde756632dd..ef6b80069c848e305205e8de9c6c654e79cd00c1 100644 (file)
--- 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 <inttypes.h>
-#include "bswap.h"
 #include "pcm_local.h"
 #include "pcm_plugin.h"
 #include "pcm_rate.h"
-
 #include "plugin_ops.h"
+#include "bswap.h"
+#include <inttypes.h>
 
 #if 0
 #define DEBUG_REFINE

diff --git a/src/pcm/pcm_rate_linear.c b/src/pcm/pcm_rate_linear.c
index 53ce902d006a6c854869d372f4bc8c648f0ed35f..35a4d8ead48a3709043b7ec046f995dc56142cd4 100644 (file)
--- 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 <inttypes.h>
-#include "bswap.h"
 #include "pcm_local.h"
 #include "pcm_plugin.h"
 #include "pcm_rate.h"
-
 #include "plugin_ops.h"
+#include "bswap.h"
+#include <inttypes.h>
 
 
 /* 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 21b869cc2b5b557d87b84a018c4a6d89074bd236..94292fc76e4c1055aeb365f6fabcc960c8f72c03 100644 (file)
--- a/src/pcm/pcm_route.c
+++ b/src/pcm/pcm_route.c
@@ -26,12 +26,11 @@
  *
  */
   
-#include "bswap.h"
-#include <math.h>
 #include "pcm_local.h"
 #include "pcm_plugin.h"
-
 #include "plugin_ops.h"
+#include "bswap.h"
+#include <math.h>
 
 #ifndef PIC
 /* entry for static linking */

diff --git a/src/pcm/pcm_share.c b/src/pcm/pcm_share.c
index 677f41328cb1c6216d063222ac997a60ce73c16c..0699fc87aad51a340b359139c25fc7f1d29d4505 100644 (file)
--- a/src/pcm/pcm_share.c
+++ b/src/pcm/pcm_share.c
@@ -26,6 +26,7 @@
  *
  */
   
+#include "pcm_local.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
@@ -36,7 +37,6 @@
 #include <sys/socket.h>
 #include <poll.h>
 #include <pthread.h>
-#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 3e3dbc79744e45d47cb1154bf9d617c640fc75e4..75f2aa0a5f44c46dd88c9b1a66f7efe42e279a53 100644 (file)
--- a/src/pcm/pcm_softvol.c
+++ b/src/pcm/pcm_softvol.c
@@ -26,11 +26,10 @@
  *
  */
 
-#include "bswap.h"
-#include <math.h>
 #include "pcm_local.h"
 #include "pcm_plugin.h"
-
+#include "bswap.h"
+#include <math.h>
 #include <sound/tlv.h>
 
 #ifndef PIC

diff --git a/src/rawmidi/rawmidi_hw.c b/src/rawmidi/rawmidi_hw.c
index cc4ffd8eb51d49c7968e8a1b5437270e0d8c05eb..3b1d941e973dff8d231bdd6140bf97c53197c35d 100644 (file)
--- a/src/rawmidi/rawmidi_hw.c
+++ b/src/rawmidi/rawmidi_hw.c
@@ -20,6 +20,7 @@
  *
  */
 
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/src/socket.c b/src/socket.c
index 99da23e760ddd04c3d20f830e92f3a4833ca502b..c68fa300aa9709847ec0a4d0fa1511303eea3f9f 100644 (file)
--- a/src/socket.c
+++ b/src/socket.c
@@ -25,6 +25,7 @@
  *
  */
   
+#include "local.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
@@ -37,7 +38,6 @@
 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <netdb.h>
-#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 f8aba830320e6ff0f275c0c8c7ce5a402177b278..9c52c9cc5a6a57d6d7ec861ea1f1de8a78a20df4 100644 (file)
--- a/src/topology/builder.c
+++ b/src/topology/builder.c
@@ -17,7 +17,6 @@
            Liam Girdwood <liam.r.girdwood@linux.intel.com>
 */
 
-#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 ebdff46968f66bc94beabe051fe9748b0cf20a47..9239c3b2b45f28b586a7b2fc471b6272a880d859 100644 (file)
--- a/src/topology/channel.c
+++ b/src/topology/channel.c
@@ -17,7 +17,6 @@
            Liam Girdwood <liam.r.girdwood@linux.intel.com>
 */
 
-#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 dd05424d30764b763eb2196da0adba7482f2bca8..04f39d770833a8ece4fdb27beef048d5aeb19e95 100644 (file)
--- a/src/topology/ctl.c
+++ b/src/topology/ctl.c
@@ -17,7 +17,6 @@
            Liam Girdwood <liam.r.girdwood@linux.intel.com>
 */
 
-#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 1c15ce8a8ed2d64678ae93bc8df359263f73d48c..55bb2faba55918374dc9780c7c0324ebab6aaea0 100644 (file)
--- a/src/topology/dapm.c
+++ b/src/topology/dapm.c
@@ -17,7 +17,6 @@
            Liam Girdwood <liam.r.girdwood@linux.intel.com>
 */
 
-#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 972b4b7ac94b3879ca7fb6145a88b0668c90cb60..2f077d369f35abbc92418e4609b94891219fa473 100644 (file)
--- a/src/topology/data.c
+++ b/src/topology/data.c
@@ -17,7 +17,6 @@
            Liam Girdwood <liam.r.girdwood@linux.intel.com>
 */
 
-#include "list.h"
 #include "tplg_local.h"
 #include <ctype.h>
 

diff --git a/src/topology/decoder.c b/src/topology/decoder.c
index 66ebe5d8a6682e92a3ee6cb6df36a7f422f50ffa..c8df7e35e19b9759a131e9663fbeda315488dc5b 100644 (file)
--- a/src/topology/decoder.c
+++ b/src/topology/decoder.c
@@ -15,7 +15,6 @@
   Authors: Jaroslav Kysela <perex@perex.cz>
 */
 
-#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 cbd7f4b636c1645f73f9484ec9958b6bc8197f46..a7a7241d7db187e68bd407585157f690013d6877 100644 (file)
--- a/src/topology/elem.c
+++ b/src/topology/elem.c
@@ -17,7 +17,6 @@
            Liam Girdwood <liam.r.girdwood@linux.intel.com>
 */
 
-#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 1ca365287c22592770bb350d25d3d0090acdf7a2..b06e08984f4e4eb17a1ac0d02555af9ce8da00ae 100644 (file)
--- a/src/topology/log.c
+++ b/src/topology/log.c
@@ -15,7 +15,6 @@
   Authors: Jaroslav Kysela <perex@perex.cz>
 */
 
-#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 daab357781783d8bf42087a4863c650507f42332..74f7cbabbaf4e0180c1c772a694a3ba4bf972082 100644 (file)
--- a/src/topology/ops.c
+++ b/src/topology/ops.c
@@ -17,7 +17,6 @@
            Liam Girdwood <liam.r.girdwood@linux.intel.com>
 */
 
-#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 e70173f612827217e7dc1e14d5c139b1b28d1347..874ec524c545c68efd4bbc6671afc28f73894834 100644 (file)
--- a/src/topology/parser.c
+++ b/src/topology/parser.c
@@ -17,9 +17,8 @@
            Liam Girdwood <liam.r.girdwood@linux.intel.com>
 */
 
-#include <sys/stat.h>
-#include "list.h"
 #include "tplg_local.h"
+#include <sys/stat.h>
 
 /*
  * Get integer value

diff --git a/src/topology/pcm.c b/src/topology/pcm.c
index 4de1d266dd9f4bc3f71d382d27f1d14a5456f002..539f258d0fedee32d95f4c6f58172b3b2fd37dd0 100644 (file)
--- a/src/topology/pcm.c
+++ b/src/topology/pcm.c
@@ -17,7 +17,6 @@
            Liam Girdwood <liam.r.girdwood@linux.intel.com>
 */
 
-#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 fecbc6a5dfa8d306ebc2b59770b23da6cf0fd5a2..59f4759b2d5cea13eecb361f0d0114a1f6659aa2 100644 (file)
--- a/src/topology/save.c
+++ b/src/topology/save.c
@@ -15,7 +15,6 @@
   Authors: Jaroslav Kysela <perex@perex.cz>
 */
 
-#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 b07feb999db9e94593812fa7c8922c8fc27da293..47abb8d84313954e358095479df89a0aee0e7e2a 100644 (file)
--- 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 1cb8b694f1419399482f89867ff850c312aaafd9..636392742d39f83929fccff18f89dc1a896a90e3 100644 (file)
--- 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 <limits.h>
 #include <stdint.h>
 #include <stdbool.h>
 
-#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 1c8481bee41035a70804e1bd58ea7734a094dd0c..00619966bf048f7be5b6e4ea8c25d2b5f051dc4b 100644 (file)
--- 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 <stdio.h>
 #if HAVE_MALLOC_H
 #include <malloc.h>

diff --git a/test/chmap.c b/test/chmap.c
index ad3b305b501c61ea14fa61156ab727f93b2adb53..52f29a76a1291c1e10be0601e6249763cdb56fae 100644 (file)
--- a/test/chmap.c
+++ b/test/chmap.c
@@ -2,6 +2,7 @@
  * channel mapping API test program
  */
 
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/test/control.c b/test/control.c
index f4b437ee1bd0aae7bad9e4f76adc7e3ffa5dae47..b0a3877efd2dbd8b659833b52211644943bfd916 100644 (file)
--- a/test/control.c
+++ b/test/control.c
@@ -1,3 +1,4 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #include "../include/asoundlib.h"

diff --git a/test/latency.c b/test/latency.c
index 40c63e2442656a55e0f03d1378bb0850bb627097..ae37c11a557bdf22dda82c97a438bfd45662552a 100644 (file)
--- a/test/latency.c
+++ b/test/latency.c
@@ -27,6 +27,7 @@
  *
  */
 
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/test/pcm.c b/test/pcm.c
index 0484ea395e8296f3b81834854ae1d2d3e6aa157b..223edafc2f4187b2120d9dcd6dac5746381738cc 100644 (file)
--- 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 <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/test/playmidi1.c b/test/playmidi1.c
index f178279a7710f58ef496a1eb4abfb6b19f64bf25..831e95783f352edaaf846bfb8c54803b66f6e366 100644 (file)
--- a/test/playmidi1.c
+++ b/test/playmidi1.c
@@ -34,6 +34,8 @@
  *
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <ctype.h>
 #include <fcntl.h>

diff --git a/test/seq.c b/test/seq.c
index 34b000fd879f5feee04338b80062e8f393b2b18c..04f7e5d4e71da6b2988538e5d957050ef77fad8f 100644 (file)
--- a/test/seq.c
+++ b/test/seq.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/test/timer.c b/test/timer.c
index b05eb2f00d15bcce0f40720fc29eff59b551796f..63ea4a54d6254ec69a2d9ed3e6e87b9f90622055 100644 (file)
--- a/test/timer.c
+++ b/test/timer.c
@@ -1,3 +1,4 @@
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/test/user-ctl-element-set.c b/test/user-ctl-element-set.c
index fee130e237f3bc3d52ce20616da58961859b629e..ceccdba75cb6390bed12bbc47a107466c68848cc 100644 (file)
--- 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 <sound/tlv.h>
 #include <stdbool.h>