[vlc-devel] commit: DirectDraw: remove unneeded includes (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Jul 18 00:53:29 2009 +0200| [f641070c9c562449907af49a9338b7f113a22f76] | committer: Jean-Baptiste Kempf 

DirectDraw: remove unneeded includes

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

 modules/video_output/msw/directx.c |    7 +++----
 modules/video_output/msw/vout.h    |    2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/video_output/msw/directx.c b/modules/video_output/msw/directx.c
index effb507..dbf7e54 100644
--- a/modules/video_output/msw/directx.c
+++ b/modules/video_output/msw/directx.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * vout.c: Windows DirectX video output display method
+ * directx.c: Windows DirectDraw video output
  *****************************************************************************
  * Copyright (C) 2001-2009 the VideoLAN team
  * $Id$
@@ -34,6 +34,7 @@
  * display video in window mode.
  *
  *****************************************************************************/
+
 #include <errno.h>                                                 /* ENOMEM */
 
 #ifdef HAVE_CONFIG_H
@@ -42,12 +43,10 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_interface.h>
-#include <vlc_playlist.h>
 #include <vlc_vout.h>
+#include <vlc_playlist.h>   /* needed for wallpaper */
 
 #include <windows.h>
-#include <tchar.h>
 #include <ddraw.h>
 #include <commctrl.h>
 
diff --git a/modules/video_output/msw/vout.h b/modules/video_output/msw/vout.h
index 9fbca15..d8f3b76 100644
--- a/modules/video_output/msw/vout.h
+++ b/modules/video_output/msw/vout.h
@@ -133,7 +133,7 @@ struct vout_sys_t
     bool   b_hw_yuv;    /* Should we use hardware YUV->RGB conversions */
 
 
-#ifdef MODULE_NAME_IS_vout_directx
+#ifdef MODULE_NAME_IS_directx
     /* Overlay alignment restrictions */
     int          i_align_src_boundary;
     int          i_align_src_size;