npapi-vlc | branch: windowless | Jean-Baptiste Kempf <j...@videolan.org> | Thu Dec 13 17:42:50 2012 +0100| [1abffe644ede146b8803fa595dc78275f680ee97] | committer: Jean-Baptiste Kempf
BasePlugin: simplify headers > http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=1abffe644ede146b8803fa595dc78275f680ee97 --- npapi/vlcplugin_base.cpp | 9 --------- npapi/vlcplugin_base.h | 18 ++++++++---------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/npapi/vlcplugin_base.cpp b/npapi/vlcplugin_base.cpp index 2822658..3af9f9f 100644 --- a/npapi/vlcplugin_base.cpp +++ b/npapi/vlcplugin_base.cpp @@ -38,15 +38,6 @@ #include <cctype> -#if defined(XP_UNIX) -# include <pthread.h> -#elif defined(XP_WIN) - /* windows headers */ -# include <winbase.h> -#else -#warning "locking not implemented for this platform" -#endif - #include <cstdio> #include <cassert> #include <cstdlib> diff --git a/npapi/vlcplugin_base.h b/npapi/vlcplugin_base.h index 6857556..03ed331 100644 --- a/npapi/vlcplugin_base.h +++ b/npapi/vlcplugin_base.h @@ -37,24 +37,23 @@ // Setup XP_MACOSX, XP_UNIX, XP_WIN #if defined(_WIN32) -#define XP_WIN 1 +# define XP_WIN 1 #elif defined(__APPLE__) -#define XP_MACOSX 1 +# define XP_MACOSX 1 #else -#define XP_UNIX 1 -#define MOZ_X11 1 +# define XP_UNIX 1 +# define MOZ_X11 1 #endif #if !defined(XP_MACOSX) && !defined(XP_UNIX) && !defined(XP_WIN) -#define XP_UNIX 1 +# define XP_UNIX 1 #elif defined(XP_MACOSX) -#undef XP_UNIX +# undef XP_UNIX #endif +/* Windows includes */ #ifdef XP_WIN - /* Windows stuff */ # include <windows.h> -# include <winbase.h> #endif #ifdef XP_UNIX @@ -79,7 +78,6 @@ #include <set> #include <assert.h> -#include "control/nporuntime.h" #include "../common/vlc_player_options.h" #include "../common/vlc_player.h" @@ -99,7 +97,7 @@ typedef struct { #elif defined(XP_WIN) CRITICAL_SECTION cs; #else -#warning "locking not implemented in this platform" +# warning "locking not implemented in this platform" #endif } plugin_lock_t; _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits