[vlc-commits] Win32 skins: reorder includes to fix warnings

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Jun  8 18:23:08 2011 +0200| [ecdd1ee8adb4966c89270dab47f60fd1b4e54bdd] | committer: Jean-Baptiste Kempf

Win32 skins: reorder includes to fix warnings

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

 modules/gui/skins2/commands/cmd_vars.hpp    |    4 ++++
 modules/gui/skins2/vars/time.cpp            |    2 +-
 modules/gui/skins2/win32/win32_dragdrop.cpp |    3 +--
 modules/gui/skins2/win32/win32_dragdrop.hpp |    5 +++++
 modules/gui/skins2/win32/win32_factory.cpp  |    4 ++++
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/modules/gui/skins2/commands/cmd_vars.hpp b/modules/gui/skins2/commands/cmd_vars.hpp
index c4e83c4..3246f9a 100644
--- a/modules/gui/skins2/commands/cmd_vars.hpp
+++ b/modules/gui/skins2/commands/cmd_vars.hpp
@@ -24,6 +24,10 @@
 #ifndef CMD_VARS_HPP
 #define CMD_VARS_HPP
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc_common.h>
 #include <vlc_playlist.h>
 
diff --git a/modules/gui/skins2/vars/time.cpp b/modules/gui/skins2/vars/time.cpp
index 3adec76..ba0686a 100644
--- a/modules/gui/skins2/vars/time.cpp
+++ b/modules/gui/skins2/vars/time.cpp
@@ -22,8 +22,8 @@
  * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <vlc_input.h>
 #include "time.hpp"
+#include <vlc_input.h>
 
 
 inline bool StreamTime::havePosition() const {
diff --git a/modules/gui/skins2/win32/win32_dragdrop.cpp b/modules/gui/skins2/win32/win32_dragdrop.cpp
index 32a640c..fb860ca 100644
--- a/modules/gui/skins2/win32/win32_dragdrop.cpp
+++ b/modules/gui/skins2/win32/win32_dragdrop.cpp
@@ -24,8 +24,7 @@
 
 #ifdef WIN32_SKINS
 
-#include <windows.h>
-#include "win32_dragdrop.hpp"
+#include "win32/win32_dragdrop.hpp"
 #include "../commands/cmd_add_item.hpp"
 #include "../events/evt_dragndrop.hpp"
 #include <list>
diff --git a/modules/gui/skins2/win32/win32_dragdrop.hpp b/modules/gui/skins2/win32/win32_dragdrop.hpp
index 4f040e1..4b76f22 100644
--- a/modules/gui/skins2/win32/win32_dragdrop.hpp
+++ b/modules/gui/skins2/win32/win32_dragdrop.hpp
@@ -25,6 +25,11 @@
 #ifndef WIN32_DRAGDROP_HPP
 #define WIN32_DRAGDROP_HPP
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <windows.h>
 #include <shellapi.h>
 #include <ole2.h>
 #include "../src/skin_common.hpp"
diff --git a/modules/gui/skins2/win32/win32_factory.cpp b/modules/gui/skins2/win32/win32_factory.cpp
index d4d8ce7..bf77872 100644
--- a/modules/gui/skins2/win32/win32_factory.cpp
+++ b/modules/gui/skins2/win32/win32_factory.cpp
@@ -24,6 +24,10 @@
 
 #ifdef WIN32_SKINS
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <windows.h>
 #include <winuser.h>
 #include <wingdi.h>