X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mozilla%2Fvlcplugin.cpp;h=93a1cd4e8d115cb53731bffa88817f266e5b7b19;hb=3e78ed5d5a8c373db784086b90fd5f772697fc4a;hp=64bab097bb58383f29c5ac1e1a1133c8b519f513;hpb=2799d36bc8abdc28df29a202acdb27223b25a7a7;p=vlc

diff --git a/mozilla/vlcplugin.cpp b/mozilla/vlcplugin.cpp
index 64bab097bb..93a1cd4e8d 100644
--- a/mozilla/vlcplugin.cpp
+++ b/mozilla/vlcplugin.cpp
@@ -1,8 +1,8 @@
 /*****************************************************************************
- * vlcplugin.cpp: a VideoLAN Client plugin for Mozilla
+ * vlcplugin.cpp: a VLC plugin for Mozilla
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: vlcplugin.cpp,v 1.2 2002/09/30 11:05:41 sam Exp $
+ * $Id: vlcplugin.cpp,v 1.6 2003/10/23 17:04:39 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -24,10 +24,23 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "config.h"
+
 #include <vlc/vlc.h>
 
+#ifdef HAVE_MOZILLA_CONFIG_H
+#   include <mozilla-config.h>
+#endif
+#include <nsISupports.h>
+#include <nsMemory.h>
 #include <npapi.h>
 
+#if !defined(XP_MACOSX) && !defined(XP_UNIX) && !defined(XP_WIN)
+#define XP_UNIX 1
+#elif defined(XP_MACOSX)
+#undef XP_UNIX
+#endif
+
 #include "vlcpeer.h"
 #include "vlcplugin.h"
 
@@ -36,7 +49,7 @@
  *****************************************************************************/
 VlcPlugin::VlcPlugin( NPP instance )
 {
-    p_instance = instance; 
+    p_instance = instance;
     p_peer = NULL;
 }
 
@@ -71,11 +84,11 @@ VlcIntf* VlcPlugin::GetPeer()
     if( !p_peer )
     {
         p_peer = new VlcPeer( this );
-        if( p_peer == NULL ) 
+        if( p_peer == NULL )
         {
             return NULL;
         }
-        
+
         NS_ADDREF( p_peer );
     }
 
@@ -113,6 +126,6 @@ void VlcPlugin::SetFileName(const char * filename)
     fclose (fh);
     fprintf(stderr, "File loaded\n");
 #endif
-    return; 
+    return;
 }