[vlc-devel] commit: Mozilla: fix compilation on OSX, where we don't use libX11 ( Rafaël Carré )

git version control git at videolan.org
Wed Mar 26 23:54:19 CET 2008


vlc | branch: master | Rafaël Carré <funman at videolan.org> | Wed Mar 26 23:54:37 2008 +0100| [1619a9c861e72e8b5badaccf95f4dfc989520e57]

Mozilla: fix compilation on OSX, where we don't use libX11

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1619a9c861e72e8b5badaccf95f4dfc989520e57
---

 projects/mozilla/vlcshell.cpp |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/projects/mozilla/vlcshell.cpp b/projects/mozilla/vlcshell.cpp
index 13696ac..de0011a 100644
--- a/projects/mozilla/vlcshell.cpp
+++ b/projects/mozilla/vlcshell.cpp
@@ -364,8 +364,10 @@ NPError NPP_Destroy( NPP instance, NPSavedData** save )
 
 NPError NPP_SetWindow( NPP instance, NPWindow* window )
 {
+#ifdef XP_UNIX && !defined(__APPLE__)
     Window control;
     unsigned int i_control_height = 0, i_control_width = 0;
+#endif
 
     if( ! instance )
     {
@@ -379,8 +381,9 @@ NPError NPP_SetWindow( NPP instance, NPWindow* window )
         /* we should probably show a splash screen here */
         return NPERR_NO_ERROR;
     }
+#ifdef XP_UNIX && !defined(__APPLE__)
     control = p_plugin->getControlWindow();
-
+#endif
     libvlc_instance_t *p_vlc = p_plugin->getVLC();
 
     /*




More information about the vlc-devel mailing list