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

[vlc] / projects / mozilla / vlcplugin.h

diff --git a/projects/mozilla/vlcplugin.h b/projects/mozilla/vlcplugin.h
index 201d94a0f6f73c31f3bb3fcaea2118d361e33dd1..b2614d816c6e95a3d8dd58d3eba08a1a0a08016a 100644 (file)
--- a/projects/mozilla/vlcplugin.h
+++ b/projects/mozilla/vlcplugin.h
@@ -92,7 +92,8 @@ public:
     {
         if( !libvlc_media_player )
         {
-             libvlc_exception_raise(ex,"no mediaplayer");
+             libvlc_exception_raise(ex);
+             libvlc_printerr("no mediaplayer");
         }
         return libvlc_media_player;
     }
@@ -107,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; };
@@ -194,7 +195,7 @@ public:
     void set_fullscreen( int, libvlc_exception_t * );
     int  get_fullscreen( libvlc_exception_t * );
 
-    int  player_has_vout( libvlc_exception_t * );
+    bool  player_has_vout( libvlc_exception_t * );
 
 private:
     bool playlist_select(int,libvlc_exception_t *);
@@ -213,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;