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-utils/pull/223
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/alsaloop/alsaloop.c b/alsaloop/alsaloop.c
index 17cb00c8abfedfc77137c99e45dc7503e8538d6b..b10733e0b3008a642459558d92601f1ba6f72c1c 100644 (file)
--- a/alsaloop/alsaloop.c
+++ b/alsaloop/alsaloop.c
@@ -20,6 +20,7 @@
  *
  */
 
+#include "aconfig.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/alsaloop/control.c b/alsaloop/control.c
index 137d481902cd4b22c71602b9c7315c5e9030f661..d3a7718099f142f61efb2dad30664afec90310f2 100644 (file)
--- a/alsaloop/control.c
+++ b/alsaloop/control.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include "aconfig.h"
 #include <ctype.h>
 #include <syslog.h>
 #include <alsa/asoundlib.h>

diff --git a/alsaloop/effect-sweep.c b/alsaloop/effect-sweep.c
index bb5c766fa67a189941a81cc20353c2e5b9ba3b48..47bdcd5b00f8fff0cd3b0037a0d4c77712996af4 100644 (file)
--- a/alsaloop/effect-sweep.c
+++ b/alsaloop/effect-sweep.c
@@ -18,6 +18,7 @@
  *
  */
 
+#include "aconfig.h"
 #include <math.h>
 #include <alsa/asoundlib.h>
 

diff --git a/alsaloop/pcmjob.c b/alsaloop/pcmjob.c
index 5e616a10999395430ce360721d879da9da7f1a22..be7197122ed9485e128888b4e1a8ce30333d47ea 100644 (file)
--- a/alsaloop/pcmjob.c
+++ b/alsaloop/pcmjob.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include "aconfig.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/amidi/amidi.c b/amidi/amidi.c
index a8fa84b7e658e2fd8242d154111d926c239d54d4..f930ca8ef30bf4691a3e7c2bb64f3d3336c957dc 100644 (file)
--- a/amidi/amidi.c
+++ b/amidi/amidi.c
@@ -20,6 +20,8 @@
  */
 
 #define _GNU_SOURCE
+#include "aconfig.h"
+#include "version.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -37,8 +39,6 @@
 #include <fcntl.h>
 #include <alsa/asoundlib.h>
 #include <time.h>
-#include "aconfig.h"
-#include "version.h"
 
 #define NSEC_PER_SEC 1000000000L
 

diff --git a/amixer/amixer.c b/amixer/amixer.c
index 1a49d4895e0977d7574c2975dc340909811a6d4c..8b8000b373c64274fa2baddf04333d9367e18c61 100644 (file)
--- a/amixer/amixer.c
+++ b/amixer/amixer.c
@@ -18,6 +18,7 @@
  *
  */
 
+#include "aconfig.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/axfer/container.h b/axfer/container.h
index ab162c81c768c7859b609e97cef88bc6f66fae08..3dd466a2336d4dbd318483915be403ea8c346673 100644 (file)
--- a/axfer/container.h
+++ b/axfer/container.h
@@ -9,6 +9,8 @@
 #ifndef __ALSA_UTILS_AXFER_CONTAINER__H_
 #define __ALSA_UTILS_AXFER_CONTAINER__H_
 
+#include "aconfig.h"
+
 #define _LARGEFILE64_SOURCE
 #include <sys/types.h>
 

diff --git a/axfer/xfer.h b/axfer/xfer.h
index 24349cd6d4d222ce133cda4f2f7e58b2ad72cfca..b5a0e294404380f15697329ec057c1b9704e6d8a 100644 (file)
--- a/axfer/xfer.h
+++ b/axfer/xfer.h
@@ -9,12 +9,12 @@
 #ifndef __ALSA_UTILS_AXFER_XFER__H_
 #define __ALSA_UTILS_AXFER_XFER__H_
 
+#include "aconfig.h"
+
 #include "mapper.h"
 
 #include <getopt.h>
 
-#include "aconfig.h"
-
 enum xfer_type {
        XFER_TYPE_UNSUPPORTED = -1,
        XFER_TYPE_LIBASOUND = 0,

diff --git a/bat/alsa.c b/bat/alsa.c
index d05c47e826eaafca10d648fcc7a18daa2a9bee0e..67489c4214fbc06c5a4ac8f8903a406dff88561b 100644 (file)
--- a/bat/alsa.c
+++ b/bat/alsa.c
@@ -13,6 +13,8 @@
  *
  */
 
+#include "aconfig.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <stdbool.h>
@@ -22,7 +24,6 @@
 
 #include <alsa/asoundlib.h>
 
-#include "aconfig.h"
 #include "gettext.h"
 
 #include "common.h"

diff --git a/bat/analyze.c b/bat/analyze.c
index 211dfc1084aa2ae2dcc2937104779f8366e007d5..686788000f99f74ddf89fe1e73c876c7ea273344 100644 (file)
--- a/bat/analyze.c
+++ b/bat/analyze.c
@@ -13,6 +13,8 @@
  *
  */
 
+#include "aconfig.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -22,7 +24,6 @@
 #include <math.h>
 #include <fftw3.h>
 
-#include "aconfig.h"
 #include "gettext.h"
 
 #include "common.h"

diff --git a/bat/common.c b/bat/common.c
index 47c3ea5e1d750b7ea0cd8e7743195ac1f9325dd3..9ff940572029127a3b463eb8bc5ff42394dfc01d 100644 (file)
--- a/bat/common.c
+++ b/bat/common.c
@@ -13,13 +13,14 @@
  *
  */
 
+#include "aconfig.h"
+
 #include <stdio.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <errno.h>
 
-#include "aconfig.h"
 #include "gettext.h"
 
 #include "common.h"

diff --git a/bat/convert.c b/bat/convert.c
index f55538906849498e64115e50eab2665dd6823220..c502ae547f94cb291c0fc85be9de23f92b53364b 100644 (file)
--- a/bat/convert.c
+++ b/bat/convert.c
@@ -13,6 +13,7 @@
  *
  */
 
+#include "aconfig.h"
 #include <stdio.h>
 #include <stddef.h>
 #include <stdlib.h>

diff --git a/bat/latencytest.c b/bat/latencytest.c
index 8c10efb07520b65ca649441aa46229e7d6ae0fbb..7c9db6140c114766b59216f495bd31a1d501578f 100644 (file)
--- a/bat/latencytest.c
+++ b/bat/latencytest.c
@@ -13,6 +13,8 @@
  *
  */
 
+#include "aconfig.h"
+
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/bat/signal.c b/bat/signal.c
index c9b5c7beff033b4d0688c8b5e1cd4b17786d71f3..da5368c9c3d9c2e423e0489d709d1bd8d3a1ca92 100644 (file)
--- a/bat/signal.c
+++ b/bat/signal.c
@@ -20,6 +20,8 @@
  * stable indefinitely
  */
 
+#include "aconfig.h"
+
 #include <stdio.h>
 #include <stddef.h>
 #include <stdlib.h>

diff --git a/bat/tinyalsa.c b/bat/tinyalsa.c
index f1c20fab06fab98bd7c5c14a1b0622fed178fa17..cde57094fb947374238790c283e0c93aff741d0b 100644 (file)
--- a/bat/tinyalsa.c
+++ b/bat/tinyalsa.c
@@ -13,6 +13,8 @@
  *
  */
 
+#include "aconfig.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <stdbool.h>
@@ -22,7 +24,6 @@
 
 #include <tinyalsa/asoundlib.h>
 
-#include "aconfig.h"
 #include "gettext.h"
 
 #include "common.h"

diff --git a/iecset/iecset.c b/iecset/iecset.c
index 9b3c1d7aa93fe5fdda6ba258c372c257207057e5..65e942589c2b92e69661d75052d8f991db1fc850 100644 (file)
--- a/iecset/iecset.c
+++ b/iecset/iecset.c
@@ -17,6 +17,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "aconfig.h"
 #include <stdio.h>
 #include <ctype.h>
 #include <alsa/asoundlib.h>

diff --git a/nhlt/nhlt-dmic-info.c b/nhlt/nhlt-dmic-info.c
index 8d3c538fe495fc90e8f17c65ab77ddf1000ff8f5..3f6c64d992b919c3a5d7fc4fbc5170e0747754c8 100644 (file)
--- a/nhlt/nhlt-dmic-info.c
+++ b/nhlt/nhlt-dmic-info.c
@@ -23,6 +23,7 @@
  *
  */
 
+#include "aconfig.h"
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -271,7 +272,7 @@ static int nhlt_to_json(FILE *out, const char *nhlt_file)
  */
 
 #define PROG "nhlt-dmic-info"
-#define VERSION "1"
+#define PROG_VERSION "1"
 
 #define NHLT_FILE "/sys/firmware/acpi/tables/NHLT"
 
@@ -380,7 +381,7 @@ int main(int argc, char *argv[])
                        debug = 1;
                        break;
                case 'v':
-                       printf(PROG " version " VERSION "\n");
+                       printf(PROG " version " PROG_VERSION "\n");
                        res = EXIT_SUCCESS;
                        goto out;
                case '?':               // error msg already printed

diff --git a/seq/aconnect/aconnect.c b/seq/aconnect/aconnect.c
index eeae4b5a456f93e52c6a13c49589dc1c7d232080..3a10de9d95af873c2678647466e0da0588df787c 100644 (file)
--- a/seq/aconnect/aconnect.c
+++ b/seq/aconnect/aconnect.c
@@ -15,6 +15,7 @@
  *
  */
 
+#include "aconfig.h"
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
@@ -26,7 +27,6 @@
 #include <locale.h>
 #include <sys/ioctl.h>
 #include <alsa/asoundlib.h>
-#include "aconfig.h"
 #include "gettext.h"
 
 #ifdef SND_SEQ_PORT_CAP_INACTIVE

diff --git a/seq/aplaymidi/aplaymidi.c b/seq/aplaymidi/aplaymidi.c
index 88d4e63958306f865858f6e00d1dd26fbba1ca57..a7293d31fb31dd70008c3bd4379d1920c7e345c1 100644 (file)
--- a/seq/aplaymidi/aplaymidi.c
+++ b/seq/aplaymidi/aplaymidi.c
@@ -21,6 +21,7 @@
 
 /* TODO: sequencer queue timer selection */
 
+#include "aconfig.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -28,7 +29,6 @@
 #include <getopt.h>
 #include <unistd.h>
 #include <alsa/asoundlib.h>
-#include "aconfig.h"
 #include "version.h"
 #ifdef HAVE_SEQ_CLIENT_INFO_GET_MIDI_VERSION
 #include <alsa/ump_msg.h>

diff --git a/seq/aseqdump/aseqdump.c b/seq/aseqdump/aseqdump.c
index c66f9350b4b92245ef4a82fff280c5209331e03d..8455ecba3d858426772aaab57fa3b1f15cf47ec3 100644 (file)
--- a/seq/aseqdump/aseqdump.c
+++ b/seq/aseqdump/aseqdump.c
@@ -19,6 +19,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "aconfig.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -27,7 +28,6 @@
 #include <getopt.h>
 #include <poll.h>
 #include <alsa/asoundlib.h>
-#include "aconfig.h"
 #include "version.h"
 #ifdef HAVE_SEQ_CLIENT_INFO_GET_MIDI_VERSION
 #include <alsa/ump_msg.h>

diff --git a/seq/aseqnet/aseqnet.c b/seq/aseqnet/aseqnet.c
index 650502ce5c42ef3dd7698e4a992e0a2edcd40747..f40de7d4e0441c2a3a5e9bb9bb6011d0ff385f45 100644 (file)
--- a/seq/aseqnet/aseqnet.c
+++ b/seq/aseqnet/aseqnet.c
@@ -15,6 +15,7 @@
  *
  */
 
+#include "aconfig.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -28,7 +29,6 @@
 #include <getopt.h>
 #include <signal.h>
 #include <assert.h>
-#include "aconfig.h"
 #include "gettext.h"
 
 /*

diff --git a/speaker-test/pink.c b/speaker-test/pink.c
index ef3075554bd954c3394668c5017aa2f4d393390b..63fe296fa7f82de45d55c57634dd5e3c6a459fca 100644 (file)
--- a/speaker-test/pink.c
+++ b/speaker-test/pink.c
@@ -24,6 +24,7 @@
   Copyleft 1999 Phil Burk - No rights reserved.
 */
 
+#include "aconfig.h"
 #include <stdio.h>
 #include <math.h>
 #include "pink.h"

diff --git a/speaker-test/speaker-test.c b/speaker-test/speaker-test.c
index 8d25a7dcd7c5a7531e983df0ee57ea4f84f52d46..a13e737993b02776c55d945afa0761400b1145b4 100644 (file)
--- a/speaker-test/speaker-test.c
+++ b/speaker-test/speaker-test.c
@@ -36,6 +36,8 @@
  * $Id: speaker_test.c,v 1.00 2003/11/26 19:43:38 jcdutton Exp $
  */
 
+#include "aconfig.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -53,7 +55,6 @@
 #include <sys/time.h>
 #include <math.h>
 #include "pink.h"
-#include "aconfig.h"
 #include "gettext.h"
 #include "version.h"
 #include "os_compat.h"

diff --git a/topology/nhlt/intel/dmic-nhlt.c b/topology/nhlt/intel/dmic-nhlt.c
index fe2c7903888cd8e695cf91120a369398d66646a2..70a22e3e288a9e0c39cbbf4937454fa2cf9708f1 100644 (file)
--- a/topology/nhlt/intel/dmic-nhlt.c
+++ b/topology/nhlt/intel/dmic-nhlt.c
@@ -4,6 +4,7 @@
 //
 // Author: Jaska Uimonen <jaska.uimonen@linux.intel.com>
 
+#include "aconfig.h"
 #include <stdint.h>
 #include <errno.h>
 #include <stdio.h>

diff --git a/topology/nhlt/intel/dmic/dmic-debug.c b/topology/nhlt/intel/dmic/dmic-debug.c
index beea23f8006dcc5fcdfa0812880f113b252c98a2..f99d308c041950f5fc7733386894acbd509e6787 100644 (file)
--- a/topology/nhlt/intel/dmic/dmic-debug.c
+++ b/topology/nhlt/intel/dmic/dmic-debug.c
@@ -5,6 +5,7 @@
 // Author: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
 //         Jaska Uimonen <jaska.uimonen@linux.intel.com>
 
+#include "aconfig.h"
 #include <stdio.h>
 #include <stdint.h>
 #include "dmic-debug.h"

diff --git a/topology/nhlt/intel/dmic/dmic-process.c b/topology/nhlt/intel/dmic/dmic-process.c
index 3bfbf923ae5df7f2d44a32ee3999dcc62c9ada87..67623ef66a8be10ac6305cb7fdab20bb811e7cf9 100644 (file)
--- a/topology/nhlt/intel/dmic/dmic-process.c
+++ b/topology/nhlt/intel/dmic/dmic-process.c
@@ -5,6 +5,7 @@
 // Author: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
 //         Jaska Uimonen <jaska.uimonen@linux.intel.com>
 
+#include "aconfig.h"
 #include <stdint.h>
 #include <errno.h>
 #include <stdio.h>

diff --git a/topology/nhlt/intel/intel-nhlt.c b/topology/nhlt/intel/intel-nhlt.c
index 21d44da3c15eae153e0e895f51ebde093f46aff4..b245afc31d8f66ba75ef7326f8e6797efdbbb16b 100644 (file)
--- a/topology/nhlt/intel/intel-nhlt.c
+++ b/topology/nhlt/intel/intel-nhlt.c
@@ -4,6 +4,7 @@
 //
 // Author: Jaska Uimonen <jaska.uimonen@linux.intel.com>
 
+#include "aconfig.h"
 #include "intel-nhlt.h"
 
 static int get_int_val(snd_config_t *input, long *int_val, snd_config_t *top)

diff --git a/topology/nhlt/intel/ssp-nhlt.c b/topology/nhlt/intel/ssp-nhlt.c
index 6cde33c217c767c0b1ee22e0d20d0735355d5463..1137819b4f49c4f096486e8c4786251126b1cd8c 100644 (file)
--- a/topology/nhlt/intel/ssp-nhlt.c
+++ b/topology/nhlt/intel/ssp-nhlt.c
@@ -4,6 +4,7 @@
 //
 // Author: Jaska Uimonen <jaska.uimonen@linux.intel.com>
 
+#include "aconfig.h"
 #include <stdint.h>
 #include <errno.h>
 #include <stdio.h>

diff --git a/topology/nhlt/intel/ssp/ssp-debug.c b/topology/nhlt/intel/ssp/ssp-debug.c
index 36f50dd60523ad8ea95a7e20f177e9a15435b281..8c6467556e7258405348108a2f46855f7ca56df5 100644 (file)
--- a/topology/nhlt/intel/ssp/ssp-debug.c
+++ b/topology/nhlt/intel/ssp/ssp-debug.c
@@ -4,6 +4,7 @@
 //
 // Author: Jaska Uimonen <jaska.uimonen@linux.intel.com>
 
+#include "aconfig.h"
 #include <stdio.h>
 #include <stdint.h>
 #include "ssp-debug.h"

diff --git a/topology/nhlt/intel/ssp/ssp-process.c b/topology/nhlt/intel/ssp/ssp-process.c
index 32fe3227a194ac3e790f0bad4a690b14f23f5294..9cda5c3500d902fc24bce30965ebce95c31358ad 100644 (file)
--- a/topology/nhlt/intel/ssp/ssp-process.c
+++ b/topology/nhlt/intel/ssp/ssp-process.c
@@ -7,6 +7,7 @@
 //         Rander Wang <rander.wang@linux.intel.com>
 //         Jaska Uimonen <jaska.uimonen@linux.intel.com>
 
+#include "aconfig.h"
 #include <stdint.h>
 #include <errno.h>
 #include <stdio.h>

diff --git a/topology/nhlt/nhlt-processor.c b/topology/nhlt/nhlt-processor.c
index 57e9edddc7ad41432304b1f5523725f5a24d5fd2..567fa5cc2498142631f1de53046059071a86f301 100644 (file)
--- a/topology/nhlt/nhlt-processor.c
+++ b/topology/nhlt/nhlt-processor.c
@@ -4,6 +4,7 @@
 //
 // Author: Jaska Uimonen <jaska.uimonen@linux.intel.com>
 
+#include "aconfig.h"
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/topology/pre-process-class.c b/topology/pre-process-class.c
index 4f07a8b4f16006f1ff782615f26deed231cbd197..d883d053fcb6acb4abe7aadb1648056a5da014f5 100644 (file)
--- a/topology/pre-process-class.c
+++ b/topology/pre-process-class.c
@@ -17,6 +17,7 @@
   The full GNU General Public License is included in this distribution
   in the file called LICENSE.GPL.
 */
+#include "aconfig.h"
 #include <assert.h>
 #include <errno.h>
 #include <limits.h>

diff --git a/topology/pre-process-dai.c b/topology/pre-process-dai.c
index 9bf1a1d6d1f7a0026c1223ad3d1b1e28ab2799df..343ce81f77f042c78ac264597a97b66eacf218df 100644 (file)
--- a/topology/pre-process-dai.c
+++ b/topology/pre-process-dai.c
@@ -17,6 +17,7 @@
   The full GNU General Public License is included in this distribution
   in the file called LICENSE.GPL.
 */
+#include "aconfig.h"
 #include <errno.h>
 #include <stdio.h>
 #include <alsa/asoundlib.h>

diff --git a/topology/pre-process-object.c b/topology/pre-process-object.c
index b63402bfdb24f0edd52a2b9e126ef43043e0a82b..48555e7ff7e2d0fca6291c91b95c0a5a8c677347 100644 (file)
--- a/topology/pre-process-object.c
+++ b/topology/pre-process-object.c
@@ -17,6 +17,7 @@
   The full GNU General Public License is included in this distribution
   in the file called LICENSE.GPL.
 */
+#include "aconfig.h"
 #include <assert.h>
 #include <errno.h>
 #include <stddef.h>

diff --git a/topology/pre-processor.c b/topology/pre-processor.c
index 0b3d2b5815bfadc850fdf9b5f4f0da8a12d11a51..3903dee556b8af8b0541097dad2c236e9105699a 100644 (file)
--- a/topology/pre-processor.c
+++ b/topology/pre-processor.c
@@ -18,6 +18,7 @@
   in the file called LICENSE.GPL.
 */
 
+#include "aconfig.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <stddef.h>

diff --git a/topology/topology.c b/topology/topology.c
index c0c5270884e7f4a4c787d6d72abb0fd94498c910..1840ffe65cbaea7f6fe8ec11434c842d2d97eea1 100644 (file)
--- a/topology/topology.c
+++ b/topology/topology.c
@@ -20,6 +20,7 @@
   in the file called LICENSE.GPL.
 */
 
+#include "aconfig.h"
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>