Commit 1abffe64 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

BasePlugin: simplify headers

parent 08a7d0fc
...@@ -38,15 +38,6 @@ ...@@ -38,15 +38,6 @@
#include <cctype> #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 <cstdio>
#include <cassert> #include <cassert>
#include <cstdlib> #include <cstdlib>
......
...@@ -37,24 +37,23 @@ ...@@ -37,24 +37,23 @@
// Setup XP_MACOSX, XP_UNIX, XP_WIN // Setup XP_MACOSX, XP_UNIX, XP_WIN
#if defined(_WIN32) #if defined(_WIN32)
#define XP_WIN 1 # define XP_WIN 1
#elif defined(__APPLE__) #elif defined(__APPLE__)
#define XP_MACOSX 1 # define XP_MACOSX 1
#else #else
#define XP_UNIX 1 # define XP_UNIX 1
#define MOZ_X11 1 # define MOZ_X11 1
#endif #endif
#if !defined(XP_MACOSX) && !defined(XP_UNIX) && !defined(XP_WIN) #if !defined(XP_MACOSX) && !defined(XP_UNIX) && !defined(XP_WIN)
#define XP_UNIX 1 # define XP_UNIX 1
#elif defined(XP_MACOSX) #elif defined(XP_MACOSX)
#undef XP_UNIX # undef XP_UNIX
#endif #endif
/* Windows includes */
#ifdef XP_WIN #ifdef XP_WIN
/* Windows stuff */
# include <windows.h> # include <windows.h>
# include <winbase.h>
#endif #endif
#ifdef XP_UNIX #ifdef XP_UNIX
...@@ -79,7 +78,6 @@ ...@@ -79,7 +78,6 @@
#include <set> #include <set>
#include <assert.h> #include <assert.h>
#include "control/nporuntime.h"
#include "../common/vlc_player_options.h" #include "../common/vlc_player_options.h"
#include "../common/vlc_player.h" #include "../common/vlc_player.h"
...@@ -99,7 +97,7 @@ typedef struct { ...@@ -99,7 +97,7 @@ typedef struct {
#elif defined(XP_WIN) #elif defined(XP_WIN)
CRITICAL_SECTION cs; CRITICAL_SECTION cs;
#else #else
#warning "locking not implemented in this platform" # warning "locking not implemented in this platform"
#endif #endif
} plugin_lock_t; } plugin_lock_t;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment