[vlc-commits] Win32 Vout: remove unnecessary includes

Jean-Baptiste Kempf git at videolan.org
Wed Sep 11 12:30:53 CEST 2013


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Sep 11 12:30:19 2013 +0200| [ab93e351a251d05ca91c69e7fd02daf45e1983bd] | committer: Jean-Baptiste Kempf

Win32 Vout: remove unnecessary includes

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

 modules/video_output/msw/common.c |   18 +-----------------
 modules/video_output/msw/common.h |    1 -
 modules/video_output/msw/events.c |    4 +---
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/modules/video_output/msw/common.c b/modules/video_output/msw/common.c
index a0e663d..665d30e 100644
--- a/modules/video_output/msw/common.c
+++ b/modules/video_output/msw/common.c
@@ -29,28 +29,12 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#include <assert.h>
 
 #include <vlc_common.h>
 #include <vlc_vout_display.h>
-#include <vlc_vout_window.h>
 
 #include <windows.h>
-#include <windowsx.h>
-#include <shellapi.h>
-
-#ifdef MODULE_NAME_IS_directdraw
-#include <ddraw.h>
-#endif
-#ifdef MODULE_NAME_IS_direct3d
-#include <d3d9.h>
-#endif
-#ifdef MODULE_NAME_IS_glwin32
-#include "../opengl.h"
-#endif
-#ifdef MODULE_NAME_IS_direct2d
-#include <d2d1.h>
-#endif
+#include <assert.h>
 
 #include "common.h"
 
diff --git a/modules/video_output/msw/common.h b/modules/video_output/msw/common.h
index 9e4a57d..1d53a72 100644
--- a/modules/video_output/msw/common.h
+++ b/modules/video_output/msw/common.h
@@ -38,7 +38,6 @@
 /*****************************************************************************
  * event_thread_t: event thread
  *****************************************************************************/
-#include <vlc_picture_pool.h>
 #include "events.h"
 
 /*****************************************************************************
diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c
index 844f86d..81eaa9f 100644
--- a/modules/video_output/msw/events.c
+++ b/modules/video_output/msw/events.c
@@ -21,24 +21,22 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-
 /*****************************************************************************
  * Preamble: This file contains the functions related to the creation of
  *             a window and the handling of its messages (events).
  *****************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
 #include <vlc_common.h>
 #include <vlc_vout_display.h>
-#include <vlc_vout_window.h>
 
 #include <windows.h>
 #include <windowsx.h>                                        /* GET_X_LPARAM */
 #include <shellapi.h>                                         /* ExtractIcon */
 
-#include <vlc_keys.h>
 #include "common.h"
 
 /*****************************************************************************



More information about the vlc-commits mailing list