npapi-vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Wed Jan 2 00:11:54 2013 +0100| [c2eaf60b277c591129fbffe1c8e68cd83fa95680] | committer: Jean-Baptiste Kempf
Remove unnecessary includes > http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=c2eaf60b277c591129fbffe1c8e68cd83fa95680 --- activex/connectioncontainer.cpp | 6 ------ activex/main.cpp | 2 -- activex/oleinplaceactiveobject.h | 2 -- activex/oleobject.cpp | 2 -- activex/plugin.h | 9 +++------ activex/vlccontrol2.h | 1 - common/win32_fullscreen.h | 2 -- 7 files changed, 3 insertions(+), 21 deletions(-) diff --git a/activex/connectioncontainer.cpp b/activex/connectioncontainer.cpp index a8bd423..08f2c9a 100644 --- a/activex/connectioncontainer.cpp +++ b/activex/connectioncontainer.cpp @@ -24,14 +24,8 @@ #include "plugin.h" #include "connectioncontainer.h" - #include "utils.h" -#include <assert.h> -#include <rpc.h> -#include <rpcndr.h> -#include <objidl.h> - using namespace std; #ifdef __MINGW32__ diff --git a/activex/main.cpp b/activex/main.cpp index 61f8415..98f6e65 100644 --- a/activex/main.cpp +++ b/activex/main.cpp @@ -31,8 +31,6 @@ #include <tchar.h> -#include <objsafe.h> - #ifdef __MINGW32__ # include <_mingw.h> # if defined(__MINGW32_MAJOR_VERSION) && !defined(__MINGW64_VERSION_MAJOR) diff --git a/activex/oleinplaceactiveobject.h b/activex/oleinplaceactiveobject.h index 6b7406f..d3fa085 100644 --- a/activex/oleinplaceactiveobject.h +++ b/activex/oleinplaceactiveobject.h @@ -23,8 +23,6 @@ #ifndef __OLEINPLACEACTIVEOBJECT_H__ #define __OLEINPLACEACTIVEOBJECT_H__ -#include "oleidl.h" - class VLCOleInPlaceActiveObject : public IOleInPlaceActiveObject { diff --git a/activex/oleobject.cpp b/activex/oleobject.cpp index ca258db..b03186a 100644 --- a/activex/oleobject.cpp +++ b/activex/oleobject.cpp @@ -23,8 +23,6 @@ #include "plugin.h" #include "oleobject.h" -#include "utils.h" - #include <docobj.h> using namespace std; diff --git a/activex/plugin.h b/activex/plugin.h index 7569c65..a922265 100644 --- a/activex/plugin.h +++ b/activex/plugin.h @@ -24,16 +24,13 @@ #ifndef __PLUGIN_H__ #define __PLUGIN_H__ -#include "config.h" +#ifdef HAVE_CONFIG +# include "config.h" +#endif -#include <ole2.h> #include <olectl.h> -#include <vlc/vlc.h> - #include "../common/win32_fullscreen.h" -#include "../common/vlc_player_options.h" -#include "../common/vlc_player.h" extern "C" const GUID CLSID_VLCPlugin; extern "C" const GUID CLSID_VLCPlugin2; diff --git a/activex/vlccontrol2.h b/activex/vlccontrol2.h index 6357268..5424021 100644 --- a/activex/vlccontrol2.h +++ b/activex/vlccontrol2.h @@ -27,7 +27,6 @@ #include "axvlc_idl.h" -#include <vlc/libvlc.h> #include <ole2.h> class VLCInterfaceBase { diff --git a/common/win32_fullscreen.h b/common/win32_fullscreen.h index 82b60a3..8ac5b6d 100644 --- a/common/win32_fullscreen.h +++ b/common/win32_fullscreen.h @@ -26,8 +26,6 @@ #ifdef _WIN32 -#include <vlc/vlc.h> - #include "win32_vlcwnd.h" #include "vlc_player_options.h" #include "vlc_player.h" _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
