- fix UNIX X11 build for plugin

- give myself some credit
- removed unnecessary PLUGIN_TO_HOST_GLUE macro

diff --git a/configure.ac b/configure.ac
index 941af37cb75070680350741fee24e86d39f34e6e..c923138d5e816e1e3e5a1fdeb045614d5b07a4ea 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5009,10 +5009,13 @@ then
     then
       AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.])
     else
-      if test "${SYS}" != "mingw32"; then
+      if ${MOZILLA_CONFIG} --defines | grep -q 'MOZ_X11=1'; then
         LDFLAGS="${LDFLAGS_save} ${X_LIBS} ${X_PRE_LIBS}"
         AC_CHECK_LIB(Xt,XtStrings,
-         [VLC_ADD_LDFLAGS([mozilla],[${X_LIBS} ${X_PRE_LIBS} -lXt -lX11 -lSM -lICE])],
+         [
+            VLC_ADD_CPPFLAGS([mozilla],[${X_CFLAGS}])
+            VLC_ADD_LDFLAGS([mozilla],[${X_LIBS} ${X_PRE_LIBS} -lXt -lX11 -lSM -lICE])
+        ],
          [],
          [[${X_LIBS} ${X_PRE_LIBS} -lX11 -lSM -lICE]
         ])

diff --git a/mozilla/support/npunix.c b/mozilla/support/npunix.c
index 4bcb6511418c572e5f6e4105e0be8d8ae9c590cb..bcf4e9bc1472c2c88d8a9d29a639b98e21f97775 100644 (file)
--- a/mozilla/support/npunix.c
+++ b/mozilla/support/npunix.c
@@ -58,9 +58,6 @@
 #define PLUGINDEBUGSTR(msg)
 #endif
 
-#define PLUGIN_TO_HOST_GLUE(name, fp) (fp)
-#define HOST_TO_PLUGIN_GLUE(name, fp) (fp)
-
 /***********************************************************************
  *
  * Globals
@@ -702,7 +699,7 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
         pluginFuncs->getvalue   = NewNPP_GetValueProc(Private_GetValue);
         if( navMinorVers >= NPVERS_HAS_NOTIFICATION )
         {   
-            pluginFuncs->urlnotify = NewNPP_URLNotifyProc(PLUGIN_TO_HOST_GLUE(urlnotify, Private_URLNotify));           
+            pluginFuncs->urlnotify = NewNPP_URLNotifyProc(Private_URLNotify);           
         }
 #ifdef OJI
         if( navMinorVers >= NPVERS_HAS_LIVECONNECT )

diff --git a/mozilla/vlcruntime.cpp b/mozilla/vlcruntime.cpp
index 40927a85a3afdb549f5d954cb81dd882d91409ea..269d778cd02565b0c073f929aaed62debe7ad681 100755 (executable)
--- a/mozilla/vlcruntime.cpp
+++ b/mozilla/vlcruntime.cpp
@@ -1,3 +1,26 @@
+/*****************************************************************************
+ * vlcruntime.cpp: support for NPRuntime API for Netscape Script-able plugins
+ *                 FYI: http://www.mozilla.org/projects/plugins/npruntime.html
+ *****************************************************************************
+ * Copyright (C) 2005 the VideoLAN team
+ *
+ * Authors: Damien Fouilleul <Damien.Fouilleul@laposte.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
 #include "config.h"
 
 #include <stdio.h>