reshuffle included files to include config.h as first - v2

config.h may contain defines like _FILE_OFFSET_BITS which influence
the system wide include files (off_t types, open -> open64 function
usage etc.).

Fixes: ad3a8b8b ("reshuffle included files to include config.h as first")
Related: https://github.com/alsa-project/alsa-lib/pull/333
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/src/control/setup.c b/src/control/setup.c
index 88635e42e446bb6bdc733ceea5b853fd47cf5274..fb09611764cf127fa8fcf8969c149b53b3c5313e 100644 (file)
--- a/src/control/setup.c
+++ b/src/control/setup.c
@@ -29,13 +29,13 @@
  *
  */
 
+#include "local.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <unistd.h>
 #include <string.h>
 #include <ctype.h>
-#include "local.h"
 
 #ifndef DOC_HIDDEN
 typedef struct {

diff --git a/src/rawmidi/rawmidi.c b/src/rawmidi/rawmidi.c
index 316f524b85ad5a9d3b6ef5fc3257aa024c20d72a..c4b45fa227f15f6e32333a39e3160f8cbe317b88 100644 (file)
--- a/src/rawmidi/rawmidi.c
+++ b/src/rawmidi/rawmidi.c
@@ -144,12 +144,12 @@ This example shows open and read/write rawmidi operations.
  * Shows open and read/write rawmidi operations.
  */
  
+#include "rawmidi_local.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <unistd.h>
 #include <string.h>
-#include "rawmidi_local.h"
 
 /**
  * \brief setup the default parameters

diff --git a/src/rawmidi/rawmidi_local.h b/src/rawmidi/rawmidi_local.h
index 19dbf72584fac7d2d14edccc3100fd7d68c6bc3b..f0bb06a7d824f0d977725cb4daeaa39fbc36bb37 100644 (file)
--- a/src/rawmidi/rawmidi_local.h
+++ b/src/rawmidi/rawmidi_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_rawmidi_t *rawmidi);

diff --git a/src/rawmidi/rawmidi_virt.c b/src/rawmidi/rawmidi_virt.c
index 884b8ff8deeea47c61ccb7b5afb6ccbdcc18063a..04c485d3eabf7cd0564a7887a741ce6e6a98797f 100644 (file)
--- a/src/rawmidi/rawmidi_virt.c
+++ b/src/rawmidi/rawmidi_virt.c
@@ -19,13 +19,11 @@
  *
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include "rawmidi_local.h"
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include "rawmidi_local.h"
 #include "seq.h"
 #include "seq_midi_event.h"
 

diff --git a/src/rawmidi/ump.c b/src/rawmidi/ump.c
index 25fbaff23c9de5fdaa90e6e7b9fa86c904a9aadc..39c1c4a919284deb4e369f9df2401db27d7f8404 100644 (file)
--- a/src/rawmidi/ump.c
+++ b/src/rawmidi/ump.c
@@ -4,10 +4,6 @@
  * \brief Universal MIDI Protocol (UMP) Interface
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-#include "local.h"
 #include "rawmidi_local.h"
 #include "ump_local.h"
 

diff --git a/src/seq/seq.c b/src/seq/seq.c
index 899dfe9f96bae98cfd5b8116b04924b66a972b3e..fd8ca30e247238a89b768ce7430d4e0cc1f9d0de 100644 (file)
--- a/src/seq/seq.c
+++ b/src/seq/seq.c
@@ -777,8 +777,8 @@ void event_filter(snd_seq_t *seq, snd_seq_event_t *ev)
 
 */
 
-#include <poll.h>
 #include "seq_local.h"
+#include <poll.h>
 
 /****************************************************************************
  *                                                                          *

diff --git a/src/seq/seq_hw.c b/src/seq/seq_hw.c
index a51ebfb68ebd58bf992369cff479a6901d38acf9..b74948c81c9eb5f74c2890a43706da07c2ab679e 100644 (file)
--- a/src/seq/seq_hw.c
+++ b/src/seq/seq_hw.c
@@ -20,9 +20,9 @@
  *
  */
 
+#include "seq_local.h"
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include "seq_local.h"
 
 #ifndef PIC
 /* entry for static linking */

diff --git a/src/seq/seq_local.h b/src/seq/seq_local.h
index 9b4a65459d3d7390853d6a523118c8fc35f5a9bc..468248062638378f930cef02c57db7d42231f03c 100644 (file)
--- a/src/seq/seq_local.h
+++ b/src/seq/seq_local.h
@@ -23,10 +23,10 @@
 #ifndef __SEQ_LOCAL_H
 #define __SEQ_LOCAL_H
 
+#include "local.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
-#include "local.h"
 
 #define SND_SEQ_OBUF_SIZE      (16*1024)       /* default size */
 #define SND_SEQ_IBUF_SIZE      500             /* in event_size aligned */

diff --git a/src/seq/seq_midi_event.c b/src/seq/seq_midi_event.c
index df09bde30eea90e8e55cf59a0db68ea283bf20cf..95a44e9bc3233bea8d4eecc0a0502c9dcc3eae6a 100644 (file)
--- a/src/seq/seq_midi_event.c
+++ b/src/seq/seq_midi_event.c
@@ -28,10 +28,10 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "local.h"
 #if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
-#include "local.h"
 
 #ifndef DOC_HIDDEN
 

diff --git a/src/seq/seqmid.c b/src/seq/seqmid.c
index 55651f3896f37fc1c1599f91288e1398189b8d60..9ec93ee8ade1b30277eb920c4ef82edd5db8fbea 100644 (file)
--- a/src/seq/seqmid.c
+++ b/src/seq/seqmid.c
@@ -20,14 +20,12 @@
  *
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include "seq_local.h"
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
 #include <ctype.h>
 #include <sys/ioctl.h>
-#include "seq_local.h"
 
 /**
  * \brief queue controls - start/stop/continue

diff --git a/src/userfile.c b/src/userfile.c
index 4a740834313c7aec21b0006b4fd82ce6ceaaa997..492ea9cbc238dbc7771f0668d9ad4db7730e143e 100644 (file)
--- a/src/userfile.c
+++ b/src/userfile.c
@@ -18,7 +18,7 @@
  *
  */
   
-#include <config.h>
+#include "config.h"
 #include <string.h>
 #include <errno.h>
 #include <assert.h>