From f66626b34809a4881a52582ae755586e885270c6 Mon Sep 17 00:00:00 2001 From: Yohann Martineau Date: Tue, 24 Jun 2008 00:19:07 +0200 Subject: [PATCH] fixed compilation on debian etch. config.h is now included first, before any other header. Signed-off-by: Antoine Cellerier --- modules/access_output/file.c | 9 +++++---- modules/audio_filter/channel_mixer/headphone.c | 3 ++- modules/audio_filter/channel_mixer/mono.c | 8 ++++---- modules/audio_filter/equalizer.c | 3 ++- modules/audio_filter/normvol.c | 8 ++++---- modules/audio_filter/param_eq.c | 3 ++- modules/audio_output/file.c | 3 ++- modules/audio_output/oss.c | 9 +++++---- modules/control/motion.c | 3 ++- modules/demux/demuxdump.c | 3 ++- modules/demux/mp4/drms.c | 13 ++++++------- modules/mux/mpeg/pes.c | 9 +++++---- modules/stream_out/mosaic_bridge.c | 3 ++- modules/video_chroma/i420_rgb.c | 3 ++- modules/video_chroma/i420_ymga.c | 3 ++- modules/video_filter/adjust.c | 5 +++-- modules/video_filter/colorthres.c | 5 +++-- modules/video_filter/deinterlace.c | 3 ++- modules/video_filter/gradient.c | 4 ++-- modules/video_filter/psychedelic.c | 4 ++-- modules/video_filter/ripple.c | 4 ++-- modules/video_filter/rotate.c | 4 ++-- modules/video_filter/wave.c | 4 ++-- modules/video_output/fb.c | 9 +++++---- modules/video_output/opengl.c | 3 ++- modules/video_output/x11/glx.c | 3 ++- src/misc/filter_chain.c | 4 ++++ src/misc/image.c | 6 ++++-- src/misc/md5.c | 3 ++- src/text/iso_lang.c | 3 ++- 30 files changed, 86 insertions(+), 61 deletions(-) diff --git a/modules/access_output/file.c b/modules/access_output/file.c index 639954889b..9abce9b884 100644 --- a/modules/access_output/file.c +++ b/modules/access_output/file.c @@ -25,16 +25,17 @@ /***************************************************************************** * Preamble *****************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include #include #include #include -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include #include #include diff --git a/modules/audio_filter/channel_mixer/headphone.c b/modules/audio_filter/channel_mixer/headphone.c index 4f903e8fbb..b57876a5c4 100644 --- a/modules/audio_filter/channel_mixer/headphone.c +++ b/modules/audio_filter/channel_mixer/headphone.c @@ -25,12 +25,13 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* sqrt */ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include /* sqrt */ + #include #include #include diff --git a/modules/audio_filter/channel_mixer/mono.c b/modules/audio_filter/channel_mixer/mono.c index a6633249be..5948f05223 100644 --- a/modules/audio_filter/channel_mixer/mono.c +++ b/modules/audio_filter/channel_mixer/mono.c @@ -24,6 +24,10 @@ /***************************************************************************** * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include /* sqrt */ #ifdef HAVE_STDINT_H @@ -36,10 +40,6 @@ # include #endif -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include #include #include diff --git a/modules/audio_filter/equalizer.c b/modules/audio_filter/equalizer.c index 9c9b08d5de..999796a715 100644 --- a/modules/audio_filter/equalizer.c +++ b/modules/audio_filter/equalizer.c @@ -24,12 +24,13 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include + #include #include diff --git a/modules/audio_filter/normvol.c b/modules/audio_filter/normvol.c index 97ed3c78ac..0c57c0b97a 100644 --- a/modules/audio_filter/normvol.c +++ b/modules/audio_filter/normvol.c @@ -32,6 +32,10 @@ * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include /* ENOMEM */ #include #include @@ -39,10 +43,6 @@ #include -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include #include diff --git a/modules/audio_filter/param_eq.c b/modules/audio_filter/param_eq.c index acd04de903..53c000f0e7 100644 --- a/modules/audio_filter/param_eq.c +++ b/modules/audio_filter/param_eq.c @@ -25,12 +25,13 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include + #include #include #include diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c index c8af6f5f90..07da0fe138 100644 --- a/modules/audio_output/file.c +++ b/modules/audio_output/file.c @@ -25,12 +25,13 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include + #include #include #include diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c index db1e28e63e..fcd3ca0ea2 100644 --- a/modules/audio_output/oss.c +++ b/modules/audio_output/oss.c @@ -26,15 +26,16 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* ENOMEM */ -#include /* open(), O_WRONLY */ -#include /* ioctl() */ -#include /* write(), close() */ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include /* ENOMEM */ +#include /* open(), O_WRONLY */ +#include /* ioctl() */ +#include /* write(), close() */ + #include #include diff --git a/modules/control/motion.c b/modules/control/motion.c index ccecf4d082..59d6ba2c51 100644 --- a/modules/control/motion.c +++ b/modules/control/motion.c @@ -25,12 +25,13 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include + #include #include #include diff --git a/modules/demux/demuxdump.c b/modules/demux/demuxdump.c index 93d695dd18..5f2a5f01b1 100644 --- a/modules/demux/demuxdump.c +++ b/modules/demux/demuxdump.c @@ -24,12 +24,13 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include + #include #include #include diff --git a/modules/demux/mp4/drms.c b/modules/demux/mp4/drms.c index ecc6fa19bd..520c6bb8dc 100644 --- a/modules/demux/mp4/drms.c +++ b/modules/demux/mp4/drms.c @@ -22,13 +22,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ - -#ifdef WIN32 -# include -#else -# include -#endif - #ifdef __LIBVLC__ #ifdef HAVE_CONFIG_H # include "config.h" @@ -42,6 +35,12 @@ # include "drmsvl.h" #endif +#ifdef WIN32 +# include +#else +# include +#endif + #ifdef HAVE_ERRNO_H # include #endif diff --git a/modules/mux/mpeg/pes.c b/modules/mux/mpeg/pes.c index 9f77b6a52b..c4b6ca5ce8 100644 --- a/modules/mux/mpeg/pes.c +++ b/modules/mux/mpeg/pes.c @@ -25,15 +25,16 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include +#include +#include +#include + #include #include #include diff --git a/modules/stream_out/mosaic_bridge.c b/modules/stream_out/mosaic_bridge.c index 147d4d0881..12f0309cef 100644 --- a/modules/stream_out/mosaic_bridge.c +++ b/modules/stream_out/mosaic_bridge.c @@ -25,12 +25,13 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* ENOMEM */ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include /* ENOMEM */ + #include #include #include diff --git a/modules/video_chroma/i420_rgb.c b/modules/video_chroma/i420_rgb.c index e84d24803c..6c608bb2bb 100644 --- a/modules/video_chroma/i420_rgb.c +++ b/modules/video_chroma/i420_rgb.c @@ -25,12 +25,13 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* exp(), pow() */ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include /* exp(), pow() */ + #include #include #include diff --git a/modules/video_chroma/i420_ymga.c b/modules/video_chroma/i420_ymga.c index 63d09a8cf1..4efc6a6420 100644 --- a/modules/video_chroma/i420_ymga.c +++ b/modules/video_chroma/i420_ymga.c @@ -24,12 +24,13 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* ENOMEM */ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include /* ENOMEM */ + #include #include #include diff --git a/modules/video_filter/adjust.c b/modules/video_filter/adjust.c index 9d5ff526e6..a3588e82cb 100644 --- a/modules/video_filter/adjust.c +++ b/modules/video_filter/adjust.c @@ -25,13 +25,14 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include +#include + #include #include #include diff --git a/modules/video_filter/colorthres.c b/modules/video_filter/colorthres.c index 73b81d301c..31f90f07b3 100644 --- a/modules/video_filter/colorthres.c +++ b/modules/video_filter/colorthres.c @@ -24,13 +24,14 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include +#include + #include #include #include diff --git a/modules/video_filter/deinterlace.c b/modules/video_filter/deinterlace.c index 380d0f01ef..256462d24a 100644 --- a/modules/video_filter/deinterlace.c +++ b/modules/video_filter/deinterlace.c @@ -24,12 +24,13 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include + #ifdef HAVE_ALTIVEC_H # include #endif diff --git a/modules/video_filter/gradient.c b/modules/video_filter/gradient.c index e060b3f73c..ade94b9252 100644 --- a/modules/video_filter/gradient.c +++ b/modules/video_filter/gradient.c @@ -26,12 +26,12 @@ * Preamble *****************************************************************************/ -#include /* sin(), cos() */ - #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include /* sin(), cos() */ + #include #include #include diff --git a/modules/video_filter/psychedelic.c b/modules/video_filter/psychedelic.c index 8be202a218..271533de8d 100644 --- a/modules/video_filter/psychedelic.c +++ b/modules/video_filter/psychedelic.c @@ -26,12 +26,12 @@ * Preamble *****************************************************************************/ -#include /* sin(), cos() */ - #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include /* sin(), cos() */ + #include #include diff --git a/modules/video_filter/ripple.c b/modules/video_filter/ripple.c index 5dcbcb0ba0..0010856540 100644 --- a/modules/video_filter/ripple.c +++ b/modules/video_filter/ripple.c @@ -26,12 +26,12 @@ * Preamble *****************************************************************************/ -#include /* sin(), cos() */ - #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include /* sin(), cos() */ + #include #include #include diff --git a/modules/video_filter/rotate.c b/modules/video_filter/rotate.c index 38f3c062df..e185a33ce4 100644 --- a/modules/video_filter/rotate.c +++ b/modules/video_filter/rotate.c @@ -25,12 +25,12 @@ * Preamble *****************************************************************************/ -#include /* sin(), cos() */ - #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include /* sin(), cos() */ + #include #include #include diff --git a/modules/video_filter/wave.c b/modules/video_filter/wave.c index 3a9c0a5439..36f740c2c8 100644 --- a/modules/video_filter/wave.c +++ b/modules/video_filter/wave.c @@ -26,12 +26,12 @@ * Preamble *****************************************************************************/ -#include /* sin(), cos() */ - #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include /* sin(), cos() */ + #include #include #include diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c index 03d94b3c6e..e3a8fb967e 100644 --- a/modules/video_output/fb.c +++ b/modules/video_output/fb.c @@ -25,6 +25,11 @@ /***************************************************************************** * Preamble *****************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include /* ENOMEM */ #include /* SIGUSR1, SIGUSR2 */ #include /* open() */ @@ -38,10 +43,6 @@ #include /* VT_* */ #include /* KD* */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include #include #include diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c index deab0f79fc..d9eaac159b 100644 --- a/modules/video_output/opengl.c +++ b/modules/video_output/opengl.c @@ -27,12 +27,13 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* ENOMEM */ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include /* ENOMEM */ + #include #include #include diff --git a/modules/video_output/x11/glx.c b/modules/video_output/x11/glx.c index 9339e6ff0e..fe5d122d33 100644 --- a/modules/video_output/x11/glx.c +++ b/modules/video_output/x11/glx.c @@ -25,12 +25,13 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* ENOMEM */ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include /* ENOMEM */ + #include #include #include diff --git a/src/misc/filter_chain.c b/src/misc/filter_chain.c index 7c20453629..e59e0b6098 100644 --- a/src/misc/filter_chain.c +++ b/src/misc/filter_chain.c @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include diff --git a/src/misc/image.c b/src/misc/image.c index aa8a30152a..5a1a80fce8 100644 --- a/src/misc/image.c +++ b/src/misc/image.c @@ -29,12 +29,14 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include + #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include +#include + #include #include #include diff --git a/src/misc/md5.c b/src/misc/md5.c index cb57f7b652..f4f93fff81 100644 --- a/src/misc/md5.c +++ b/src/misc/md5.c @@ -22,11 +22,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include + #include #include diff --git a/src/text/iso_lang.c b/src/text/iso_lang.c index 5e7a6c6a15..eaae385ea0 100644 --- a/src/text/iso_lang.c +++ b/src/text/iso_lang.c @@ -25,12 +25,13 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include + #include #include "vlc_iso_lang.h"