[vlc-commits] commit: Remove promiscuous #include <vlc_common.h> ( Rémi Denis-Courmont )

[git at videolan.org]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jun  5 13:24:09 2010 +0300| [292351be0320d0523cc312f820a6d99d22b3fbbf] | committer: Rémi Denis-Courmont 

Remove promiscuous #include <vlc_common.h>

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

 include/vlc_xlib.h                     |    1 -
 modules/gui/skins2/x11/x11_factory.cpp |    4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/vlc_xlib.h b/include/vlc_xlib.h
index e4f0a0c..4e3632c 100644
--- a/include/vlc_xlib.h
+++ b/include/vlc_xlib.h
@@ -21,7 +21,6 @@
 #ifndef VLC_XLIB_H
 # define VLC_XLIB_H 1
 
-# include <vlc_common.h>
 # include <X11/Xlib.h>
 
 static inline bool vlc_xlib_init (vlc_object_t *obj)
diff --git a/modules/gui/skins2/x11/x11_factory.cpp b/modules/gui/skins2/x11/x11_factory.cpp
index 73eed03..79fdcaa 100644
--- a/modules/gui/skins2/x11/x11_factory.cpp
+++ b/modules/gui/skins2/x11/x11_factory.cpp
@@ -28,7 +28,6 @@
 #include <dirent.h>
 #include <sys/stat.h>
 #include <X11/Xlib.h>
-#include <vlc_xlib.h>
 
 #include "x11_factory.hpp"
 #include "x11_display.hpp"
@@ -41,6 +40,9 @@
 
 #include "../src/generic_window.hpp"
 
+#include <vlc_common.h>
+#include <vlc_xlib.h>
+
 X11Factory::X11Factory( intf_thread_t *pIntf ): OSFactory( pIntf ),
     m_pDisplay( NULL ), m_pTimerLoop( NULL ), m_dirSep( "/" )
 {