Commit 9bb5b13c authored by JP Dinger's avatar JP Dinger Committed by Rémi Denis-Courmont

Replace #if XP_SYMBOL with #if defined(XP_SYMBOL) for consistency.

parent ec021825
......@@ -54,10 +54,10 @@ VlcPlugin::VlcPlugin( NPP instance, uint16 mode ) :
p_scriptClass(NULL),
p_browser(instance),
psz_baseURL(NULL)
#if XP_WIN
#if defined(XP_WIN)
,pf_wndproc(NULL)
#endif
#if XP_UNIX
#if defined(XP_UNIX)
,i_width((unsigned)-1)
,i_height((unsigned)-1)
,i_tb_width(0)
......@@ -74,7 +74,7 @@ VlcPlugin::VlcPlugin( NPP instance, uint16 mode ) :
#endif
{
memset(&npwindow, 0, sizeof(NPWindow));
#if XP_UNIX
#if defined(XP_UNIX)
memset(&npvideo, 0, sizeof(Window));
memset(&npcontrol, 0, sizeof(Window));
#endif
......@@ -586,7 +586,7 @@ relativeurl:
return NULL;
}
#if XP_UNIX
#if defined(XP_UNIX)
int VlcPlugin::setSize(unsigned width, unsigned height)
{
int diff = (width != i_width) || (height != i_height);
......
......@@ -108,14 +108,14 @@ public:
NPClass* getScriptClass()
{ return p_scriptClass; };
#if XP_WIN
#if defined(XP_WIN)
WNDPROC getWindowProc()
{ return pf_wndproc; };
void setWindowProc(WNDPROC wndproc)
{ pf_wndproc = wndproc; };
#endif
#if XP_UNIX
#if defined(XP_UNIX)
int setSize(unsigned width, unsigned height);
Window getVideoWindow()
{ return npvideo; };
......@@ -214,10 +214,10 @@ private:
/* display settings */
NPWindow npwindow;
#if XP_WIN
#if defined(XP_WIN)
WNDPROC pf_wndproc;
#endif
#if XP_UNIX
#if defined(XP_UNIX)
unsigned int i_width, i_height;
unsigned int i_tb_width, i_tb_height;
Window npvideo, npcontrol;
......
......@@ -330,7 +330,7 @@ NPError NPP_Destroy( NPP instance, NPSavedData** save )
instance->pdata = NULL;
#if XP_WIN
#if defined(XP_WIN)
HWND win = (HWND)p_plugin->getWindow().window;
WNDPROC winproc = p_plugin->getWindowProc();
if( winproc )
......@@ -723,7 +723,7 @@ void NPP_Print( NPP instance, NPPrint* printInfo )
/******************************************************************************
* Windows-only methods
*****************************************************************************/
#if XP_WIN
#if defined(XP_WIN)
static LRESULT CALLBACK Manage( HWND p_hwnd, UINT i_msg, WPARAM wpar, LPARAM lpar )
{
VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(GetWindowLongPtr(p_hwnd, GWLP_USERDATA));
......
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