From: Paul Brossier <piem@piem.org>
Date: Sun, 11 Dec 2016 23:25:07 +0000 (+0100)
Subject: src/aubio_priv.h: move include config.h here
X-Git-Tag: 0.4.4~58
X-Git-Url: https://git.aubio.org/?p=aubio.git;a=commitdiff_plain;h=33d02426605c9921044f569805734c5449854646

src/aubio_priv.h: move include config.h here
---

diff --git a/src/aubio_priv.h b/src/aubio_priv.h
index 9e0d0c6a..2f12d8b3 100644
--- a/src/aubio_priv.h
+++ b/src/aubio_priv.h
@@ -33,7 +33,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
diff --git a/src/io/audio_unit.c b/src/io/audio_unit.c
index a21906ae..2674388a 100644
--- a/src/io/audio_unit.c
+++ b/src/io/audio_unit.c
@@ -18,9 +18,8 @@
 
 */
 
-#include "config.h"
-#ifdef HAVE_AUDIO_UNIT
 #include "aubio_priv.h"
+#ifdef HAVE_AUDIO_UNIT
 
 #include "fvec.h"
 #include "fmat.h"
diff --git a/src/io/ioutils.c b/src/io/ioutils.c
index 31bc2461..cce93c67 100644
--- a/src/io/ioutils.c
+++ b/src/io/ioutils.c
@@ -18,7 +18,6 @@
 
 */
 
-#include "config.h"
 #include "aubio_priv.h"
 
 uint_t
diff --git a/src/io/sink.c b/src/io/sink.c
index 9fecef7e..e86d085d 100644
--- a/src/io/sink.c
+++ b/src/io/sink.c
@@ -18,7 +18,6 @@
 
 */
 
-#include "config.h"
 #include "aubio_priv.h"
 #include "fvec.h"
 #include "fmat.h"
diff --git a/src/io/sink_apple_audio.c b/src/io/sink_apple_audio.c
index f83c3da3..32fbbf45 100644
--- a/src/io/sink_apple_audio.c
+++ b/src/io/sink_apple_audio.c
@@ -18,11 +18,9 @@
 
 */
 
-#include "config.h"
+#include "aubio_priv.h"
 
 #ifdef HAVE_SINK_APPLE_AUDIO
-
-#include "aubio_priv.h"
 #include "fvec.h"
 #include "fmat.h"
 #include "io/sink_apple_audio.h"
diff --git a/src/io/sink_sndfile.c b/src/io/sink_sndfile.c
index 562b3275..c105221e 100644
--- a/src/io/sink_sndfile.c
+++ b/src/io/sink_sndfile.c
@@ -19,13 +19,12 @@
 */
 
 
-#include "config.h"
+#include "aubio_priv.h"
 
 #ifdef HAVE_SNDFILE
 
 #include <sndfile.h>
 
-#include "aubio_priv.h"
 #include "fvec.h"
 #include "fmat.h"
 #include "io/sink_sndfile.h"
diff --git a/src/io/sink_wavwrite.c b/src/io/sink_wavwrite.c
index a108a2f9..2e456ea7 100644
--- a/src/io/sink_wavwrite.c
+++ b/src/io/sink_wavwrite.c
@@ -19,11 +19,10 @@
 */
 
 
-#include "config.h"
+#include "aubio_priv.h"
 
 #ifdef HAVE_WAVWRITE
 
-#include "aubio_priv.h"
 #include "fvec.h"
 #include "fmat.h"
 #include "io/sink_wavwrite.h"
diff --git a/src/io/source.c b/src/io/source.c
index 3862d71a..7f4049ad 100644
--- a/src/io/source.c
+++ b/src/io/source.c
@@ -18,7 +18,6 @@
 
 */
 
-#include "config.h"
 #include "aubio_priv.h"
 #include "fvec.h"
 #include "fmat.h"
diff --git a/src/io/source_apple_audio.c b/src/io/source_apple_audio.c
index a86d4a34..715a7e35 100644
--- a/src/io/source_apple_audio.c
+++ b/src/io/source_apple_audio.c
@@ -18,11 +18,10 @@
 
 */
 
-#include "config.h"
+#include "aubio_priv.h"
 
 #ifdef HAVE_SOURCE_APPLE_AUDIO
 
-#include "aubio_priv.h"
 #include "fvec.h"
 #include "fmat.h"
 #include "io/source_apple_audio.h"
diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c
index f14fa763..7d0a9b77 100644
--- a/src/io/source_avcodec.c
+++ b/src/io/source_avcodec.c
@@ -18,8 +18,7 @@
 
 */
 
-
-#include "config.h"
+#include "aubio_priv.h"
 
 #ifdef HAVE_LIBAV
 
diff --git a/src/io/source_sndfile.c b/src/io/source_sndfile.c
index 20cdb8b4..2f09d138 100644
--- a/src/io/source_sndfile.c
+++ b/src/io/source_sndfile.c
@@ -18,14 +18,12 @@
 
 */
 
-
-#include "config.h"
+#include "aubio_priv.h"
 
 #ifdef HAVE_SNDFILE
 
 #include <sndfile.h>
 
-#include "aubio_priv.h"
 #include "fvec.h"
 #include "fmat.h"
 #include "source_sndfile.h"
diff --git a/src/io/source_wavread.c b/src/io/source_wavread.c
index a361b959..9ab9b9d4 100644
--- a/src/io/source_wavread.c
+++ b/src/io/source_wavread.c
@@ -18,11 +18,10 @@
 
 */
 
-#include "config.h"
+#include "aubio_priv.h"
 
 #ifdef HAVE_WAVREAD
 
-#include "aubio_priv.h"
 #include "fvec.h"
 #include "fmat.h"
 #include "source_wavread.h"
diff --git a/src/io/utils_apple_audio.c b/src/io/utils_apple_audio.c
index 2e651d50..34c35784 100644
--- a/src/io/utils_apple_audio.c
+++ b/src/io/utils_apple_audio.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "aubio_priv.h"
 
 #if defined(HAVE_SOURCE_APPLE_AUDIO) || defined(HAVE_SINK_APPLE_AUDIO)
 
@@ -6,7 +6,6 @@
 #include <CoreFoundation/CoreFoundation.h>
 // ExtAudioFileRef, AudioStreamBasicDescription, AudioBufferList, ...
 #include <AudioToolbox/AudioToolbox.h>
-#include "aubio_priv.h"
 
 int createAubioBufferList(AudioBufferList *bufferList, int channels, int segmentSize);
 void freeAudioBufferList(AudioBufferList *bufferList);
diff --git a/src/mathutils.c b/src/mathutils.c
index 01b35193..45f61c93 100644
--- a/src/mathutils.c
+++ b/src/mathutils.c
@@ -24,7 +24,6 @@
 #include "fvec.h"
 #include "mathutils.h"
 #include "musicutils.h"
-#include "config.h"
 
 /** Window types */
 typedef enum
diff --git a/src/synth/sampler.c b/src/synth/sampler.c
index 7df1b5f6..050f0085 100644
--- a/src/synth/sampler.c
+++ b/src/synth/sampler.c
@@ -19,7 +19,6 @@
 */
 
 
-#include "config.h"
 #include "aubio_priv.h"
 #include "fvec.h"
 #include "fmat.h"
diff --git a/src/synth/wavetable.c b/src/synth/wavetable.c
index 830ffd75..8dacde38 100644
--- a/src/synth/wavetable.c
+++ b/src/synth/wavetable.c
@@ -19,7 +19,6 @@
 */
 
 
-#include "config.h"
 #include "aubio_priv.h"
 #include "fvec.h"
 #include "fmat.h"
diff --git a/src/temporal/resampler.c b/src/temporal/resampler.c
index cd128496..adfb08fd 100644
--- a/src/temporal/resampler.c
+++ b/src/temporal/resampler.c
@@ -18,8 +18,6 @@
 
 */
 
-#include "config.h"
-
 #include "aubio_priv.h"
 #include "fvec.h"
 #include "temporal/resampler.h"
diff --git a/src/utils/log.c b/src/utils/log.c
index 634178d2..55aa9935 100644
--- a/src/utils/log.c
+++ b/src/utils/log.c
@@ -18,7 +18,6 @@
 
 */
 
-#include "config.h"
 #include "aubio_priv.h"
 #include "log.h"
 
diff --git a/src/utils/parameter.c b/src/utils/parameter.c
index f8a8b450..00b39799 100644
--- a/src/utils/parameter.c
+++ b/src/utils/parameter.c
@@ -18,7 +18,6 @@
 
 */
 
-#include "config.h"
 #include "aubio_priv.h"
 #include "parameter.h"
 
diff --git a/src/utils/windll.c b/src/utils/windll.c
index 7c11af6d..fce588e4 100644
--- a/src/utils/windll.c
+++ b/src/utils/windll.c
@@ -24,7 +24,7 @@
 
 */
 
-#include "config.h"
+#include "aubio_priv.h"
 
 #ifdef HAVE_WIN_HACKS
 
diff --git a/src/vecutils.c b/src/vecutils.c
index 8e49f96b..8907b5ec 100644
--- a/src/vecutils.c
+++ b/src/vecutils.c
@@ -1,4 +1,3 @@
-#include "config.h"
 #include "aubio_priv.h"
 #include "types.h"
 #include "fvec.h"
diff --git a/tests/src/io/test-sink_sndfile-multi.c b/tests/src/io/test-sink_sndfile-multi.c
index 4dcc6909..46882f6d 100644
--- a/tests/src/io/test-sink_sndfile-multi.c
+++ b/tests/src/io/test-sink_sndfile-multi.c
@@ -1,6 +1,5 @@
 #define AUBIO_UNSTABLE 1
 #include <aubio.h>
-#include "config.h"
 #include "utils_tests.h"
 
 // this file uses the unstable aubio api, please use aubio_sink instead
diff --git a/tests/src/io/test-sink_sndfile.c b/tests/src/io/test-sink_sndfile.c
index 78122296..fe95310a 100644
--- a/tests/src/io/test-sink_sndfile.c
+++ b/tests/src/io/test-sink_sndfile.c
@@ -1,6 +1,5 @@
 #define AUBIO_UNSTABLE 1
 #include <aubio.h>
-#include "config.h"
 #include "utils_tests.h"
 
 // this file uses the unstable aubio api, please use aubio_sink instead