[vlc-commits] config.h MUST ALWAYS BE INCLUDED _FIRST_! Fix Windows warnings.

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat May  7 19:44:19 2011 +0300| [e539c5ce08a9133993c34328cd79de7be856415b] | committer: Rémi Denis-Courmont

config.h MUST ALWAYS BE INCLUDED _FIRST_! Fix Windows warnings.

How many times does this have to be spelt?!

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e539c5ce08a9133993c34328cd79de7be856415b
---

 modules/video_filter/deinterlace/algo_basic.c |    4 ++++
 modules/video_filter/deinterlace/merge.c      |    6 ++++--
 modules/video_filter/deinterlace/merge.h      |    4 ----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/video_filter/deinterlace/algo_basic.c b/modules/video_filter/deinterlace/algo_basic.c
index 31a697a..3436356 100644
--- a/modules/video_filter/deinterlace/algo_basic.c
+++ b/modules/video_filter/deinterlace/algo_basic.c
@@ -23,6 +23,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#   include "config.h"
+#endif
+
 #include <stdint.h>
 
 #include <vlc_common.h>
diff --git a/modules/video_filter/deinterlace/merge.c b/modules/video_filter/deinterlace/merge.c
index 539993b..0a037b0 100644
--- a/modules/video_filter/deinterlace/merge.c
+++ b/modules/video_filter/deinterlace/merge.c
@@ -24,11 +24,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#   include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <stdint.h>
 
-/* This handles including config.h, because the config
-   is already needed in the header. */
 #include "merge.h"
 
 #ifdef CAN_COMPILE_MMXEXT
diff --git a/modules/video_filter/deinterlace/merge.h b/modules/video_filter/deinterlace/merge.h
index 6526b98..999d842 100644
--- a/modules/video_filter/deinterlace/merge.h
+++ b/modules/video_filter/deinterlace/merge.h
@@ -32,10 +32,6 @@
  * Merge (line blending) routines for the VLC deinterlacer.
  */
 
-#ifdef HAVE_CONFIG_H
-#   include "config.h"
-#endif
-
 /*****************************************************************************
  * Macros
  *****************************************************************************/