Ensure sfconfig.h is included before any other header file.

31 files changed, 64 insertions, 32 deletions

diff --git a/ChangeLog b/ChangeLog
index 2dc71bd..4e57935 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-13 Erik de Castro Lopo  <erikd AT mega-nerd DOT com>
+
+    * src/*.c
+    Ensure sfconfig.h is included before any other header file.
+
 2005-10-07 Erik de Castro Lopo  <erikd AT mega-nerd DOT com>
 
     * configure.ac
diff --git a/src/caf.c b/src/caf.c
index 1433b6f..e5b45bb 100644
--- a/src/caf.c
+++ b/src/caf.c
@@ -16,13 +16,14 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include	"sfconfig.h"
+
 #include	<stdio.h>
 #include	<stdlib.h>
 #include	<string.h>
 #include	<ctype.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"sfendian.h"
 #include	"float_cast.h"
 #include	"common.h"
diff --git a/src/command.c b/src/command.c
index aeec8cb..861d159 100644
--- a/src/command.c
+++ b/src/command.c
@@ -16,12 +16,13 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include	"sfconfig.h"
+
 #include	<stdio.h>
 #include	<string.h>
 #include	<math.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"common.h"
 
 static SF_FORMAT_INFO const simple_formats [] =
diff --git a/src/dither.c b/src/dither.c
index 5fc1485..873f1bb 100644
--- a/src/dither.c
+++ b/src/dither.c
@@ -16,10 +16,11 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include	"sfconfig.h"
+
 #include	<stdlib.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"sfendian.h"
 #include	"common.h"
 
diff --git a/src/double64.c b/src/double64.c
index 17c0459..9a6f8f1 100644
--- a/src/double64.c
+++ b/src/double64.c
@@ -16,13 +16,13 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include	"sfconfig.h"
 
 #include	<stdio.h>
 #include	<stdlib.h>
 #include	<string.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"sfendian.h"
 #include	"common.h"
 #include	"float_cast.h"
diff --git a/src/dwd.c b/src/dwd.c
index b89bd47..55cbf91 100644
--- a/src/dwd.c
+++ b/src/dwd.c
@@ -16,13 +16,14 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include	"sfconfig.h"
+
 #include	<stdio.h>
 #include	<fcntl.h>
 #include	<string.h>
 #include	<ctype.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"sfendian.h"
 #include	"common.h"
 
diff --git a/src/dwvw.c b/src/dwvw.c
index 64a586f..6204340 100644
--- a/src/dwvw.c
+++ b/src/dwvw.c
@@ -26,12 +26,13 @@
 ** Lidstrom and is copyright 1993 by NuEdge Development".
 */
 
+#include	"sfconfig.h"
+
 #include	<stdio.h>
 #include	<stdlib.h>
 #include	<string.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"sfendian.h"
 #include	"float_cast.h"
 #include	"common.h"
diff --git a/src/flac.c b/src/flac.c
index b1a19c1..59371b8 100644
--- a/src/flac.c
+++ b/src/flac.c
@@ -17,6 +17,8 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include	"sfconfig.h"
+
 #include	<stdio.h>
 #include	<stdlib.h>
 #include	<fcntl.h>
@@ -24,7 +26,6 @@
 #include	<ctype.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"common.h"
 
 
diff --git a/src/float32.c b/src/float32.c
index 00daac7..b376e60 100644
--- a/src/float32.c
+++ b/src/float32.c
@@ -16,12 +16,13 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include	"sfconfig.h"
+
 #include	<stdio.h>
 #include	<stdlib.h>
 #include	<string.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"sfendian.h"
 #include	"common.h"
 #include	"float_cast.h"
diff --git a/src/htk.c b/src/htk.c
index ea08206..3fb61d3 100644
--- a/src/htk.c
+++ b/src/htk.c
@@ -16,13 +16,14 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include	"sfconfig.h"
+
 #include	<stdio.h>
 #include	<fcntl.h>
 #include	<string.h>
 #include	<ctype.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"sfendian.h"
 #include	"common.h"
 
diff --git a/src/ima_adpcm.c b/src/ima_adpcm.c
index 5a5bfe7..7ca01ef 100644
--- a/src/ima_adpcm.c
+++ b/src/ima_adpcm.c
@@ -16,12 +16,13 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include	"sfconfig.h"
+
 #include	<stdio.h>
 #include	<stdlib.h>
 #include	<string.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"sfendian.h"
 #include	"float_cast.h"
 #include	"common.h"
diff --git a/src/interleave.c b/src/interleave.c
index fe085a6..7c18bd4 100644
--- a/src/interleave.c
+++ b/src/interleave.c
@@ -16,11 +16,11 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include <stdlib.h>
+#include	"sfendian.h"
+
+#include	<stdlib.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
-#include	"sfendian.h"
 #include	"common.h"
 
 #define		INTERLEAVE_CHANNELS		6
diff --git a/src/ircam.c b/src/ircam.c
index b4d339d..48a95c3 100644
--- a/src/ircam.c
+++ b/src/ircam.c
@@ -16,13 +16,14 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include	"sfconfig.h"
+
 #include	<stdio.h>
 #include	<fcntl.h>
 #include	<string.h>
 #include	<ctype.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"sfendian.h"
 #include	"common.h"
 
diff --git a/src/mat4.c b/src/mat4.c
index 9eaaeca..cdcf3f8 100644
--- a/src/mat4.c
+++ b/src/mat4.c
@@ -16,13 +16,14 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include	"sfconfig.h"
+
 #include	<stdio.h>
 #include	<fcntl.h>
 #include	<string.h>
 #include	<ctype.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"sfendian.h"
 #include	"common.h"
 #include	"float_cast.h"
diff --git a/src/mat5.c b/src/mat5.c
index 23a2e9f..dd98ba7 100644
--- a/src/mat5.c
+++ b/src/mat5.c
@@ -16,13 +16,14 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include	"sfconfig.h"
+
 #include	<stdio.h>
 #include	<fcntl.h>
 #include	<string.h>
 #include	<ctype.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"sfendian.h"
 #include	"common.h"
 #include	"float_cast.h"
diff --git a/src/ms_adpcm.c b/src/ms_adpcm.c
index 4f3011e..8833696 100644
--- a/src/ms_adpcm.c
+++ b/src/ms_adpcm.c
@@ -16,12 +16,13 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include	"sfconfig.h"
+
 #include	<stdio.h>
 #include	<stdlib.h>
 #include	<string.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"sfendian.h"
 #include	"float_cast.h"
 #include	"common.h"
diff --git a/src/new.c b/src/new.c
index 63b2811..475e92b 100644
--- a/src/new.c
+++ b/src/new.c
@@ -16,13 +16,14 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include	"sfconfig.h"
+
 #include	<stdio.h>
 #include	<fcntl.h>
 #include	<string.h>
 #include	<ctype.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"sfendian.h"
 #include	"common.h"
 
diff --git a/src/nist.c b/src/nist.c
index acd512c..9fcef58 100644
--- a/src/nist.c
+++ b/src/nist.c
@@ -23,13 +23,14 @@
 **	However, no code from that package was used.
 */
 
+#include	"sfconfig.h"
+
 #include	<stdio.h>
 #include	<fcntl.h>
 #include	<string.h>
 #include	<ctype.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"sfendian.h"
 #include	"common.h"
 
diff --git a/src/ogg.c b/src/ogg.c
index 835031e..15e6d8e 100644
--- a/src/ogg.c
+++ b/src/ogg.c
@@ -16,13 +16,14 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include "sfconfig.h"
+
 #include <stdio.h>
 #include <fcntl.h>
 #include <string.h>
 #include <ctype.h>
 
 #include "sndfile.h"
-#include "sfconfig.h"
 #include "sfendian.h"
 #include "common.h"
 
diff --git a/src/pcm.c b/src/pcm.c
index 78f3e3d..bad607c 100644
--- a/src/pcm.c
+++ b/src/pcm.c
@@ -16,8 +16,9 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include	"sndfile.h"
 #include	"sfconfig.h"
+
+#include	"sndfile.h"
 #include	"sfendian.h"
 #include	"float_cast.h"
 #include	"common.h"
diff --git a/src/pvf.c b/src/pvf.c
index fe1a20f..54bff17 100644
--- a/src/pvf.c
+++ b/src/pvf.c
@@ -16,13 +16,14 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include	"sfconfig.h"
+
 #include	<stdio.h>
 #include	<fcntl.h>
 #include	<string.h>
 #include	<ctype.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"sfendian.h"
 #include	"common.h"
 
diff --git a/src/raw.c b/src/raw.c
index 81f842a..65be491 100644
--- a/src/raw.c
+++ b/src/raw.c
@@ -16,10 +16,11 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include	"sfconfig.h"
+
 #include	<stdio.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"common.h"
 
 /*------------------------------------------------------------------------------
diff --git a/src/rx2.c b/src/rx2.c
index 1bba83f..9f75e31 100644
--- a/src/rx2.c
+++ b/src/rx2.c
@@ -16,13 +16,14 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include	"sfconfig.h"
+
 #include	<stdio.h>
 #include	<string.h>
 #include	<ctype.h>
 #include	<stdarg.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"sfendian.h"
 #include	"common.h"
 
diff --git a/src/sd2.c b/src/sd2.c
index 70d6400..a320c60 100644
--- a/src/sd2.c
+++ b/src/sd2.c
@@ -27,13 +27,14 @@
 ** http://developer.apple.com/documentation/mac/MoreToolbox/MoreToolbox-99.html
 */
 
+#include	"sfconfig.h"
+
 #include	<stdio.h>
 #include	<stdlib.h>
 #include	<string.h>
 #include	<ctype.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"sfendian.h"
 #include	"common.h"
 
diff --git a/src/strings.c b/src/strings.c
index 1782050..4a08fdd 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -16,12 +16,13 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include	"sfconfig.h"
+
 #include	<stdio.h>
 #include	<string.h>
 #include	<math.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"common.h"
 
 #define STRINGS_DEBUG 0
diff --git a/src/txw.c b/src/txw.c
index 02af106..0f0add6 100644
--- a/src/txw.c
+++ b/src/txw.c
@@ -23,13 +23,14 @@
 ** and trial and error experimentation. The code here however is all original.
 */
 
+#include	"sfconfig.h"
+
 #include	<stdio.h>
 #include	<fcntl.h>
 #include	<string.h>
 #include	<ctype.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"sfendian.h"
 #include	"common.h"
 
diff --git a/src/vox_adpcm.c b/src/vox_adpcm.c
index caec6b9..f743a72 100644
--- a/src/vox_adpcm.c
+++ b/src/vox_adpcm.c
@@ -29,12 +29,13 @@
 **		http://ibiblio.org/pub/linux/apps/sound/convert/vox.tar.gz
 */
 
+#include	"sfconfig.h"
+
 #include	<stdio.h>
 #include	<stdlib.h>
 #include	<string.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"sfendian.h"
 #include	"float_cast.h"
 #include	"common.h"
diff --git a/src/w64.c b/src/w64.c
index 43cd08d..78ee704 100644
--- a/src/w64.c
+++ b/src/w64.c
@@ -16,13 +16,14 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include	"sfconfig.h"
+
 #include	<stdio.h>
 #include	<string.h>
 #include	<ctype.h>
 #include	<time.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"sfendian.h"
 #include	"common.h"
 #include	"wav_w64.h"
diff --git a/src/wav.c b/src/wav.c
index 20ff2fa..4e7c1b1 100644
--- a/src/wav.c
+++ b/src/wav.c
@@ -17,6 +17,7 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include	"sfconfig.h"
 
 #include	<stdio.h>
 #include	<stdlib.h>
@@ -25,7 +26,6 @@
 #include	<time.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"sfendian.h"
 #include	"common.h"
 #include	"wav_w64.h"
diff --git a/src/wav_w64.c b/src/wav_w64.c
index 0f0fb97..5415a47 100644
--- a/src/wav_w64.c
+++ b/src/wav_w64.c
@@ -17,13 +17,14 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include	"sfconfig.h"
+
 #include	<stdio.h>
 #include	<string.h>
 #include	<ctype.h>
 #include	<time.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"sfendian.h"
 #include	"common.h"
 #include	"wav_w64.h"
diff --git a/src/wve.c b/src/wve.c
index 98dec69..54a0833 100644
--- a/src/wve.c
+++ b/src/wve.c
@@ -16,13 +16,14 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include	"sfconfig.h"
+
 #include	<stdio.h>
 #include	<fcntl.h>
 #include	<string.h>
 #include	<ctype.h>
 
 #include	"sndfile.h"
-#include	"sfconfig.h"
 #include	"sfendian.h"
 #include	"common.h"