Commit 297ef073 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Make NPMac and NPUnix more similar

parent 35036325
......@@ -23,18 +23,22 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "config.h"
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <string.h>
#include <stddef.h>
#include "npapi.h"
#include "npfunctions.h"
#define CALL_NPN(unused, FN, ...) ((*FN)(__VA_ARGS__))
#include <cstring>
#include "../common.h"
#include "../vlcplugin.h"
#include "../vlcshell.h"
#include <npapi.h>
#include "npfunctions.h"
#define CALL_NPN(unused, FN, ...) ((*FN)(__VA_ARGS__))
#define PLUGIN_TO_HOST_GLUE(name, fp) (fp)
#define HOST_TO_PLUGIN_GLUE(name, fp) (fp)
......@@ -42,8 +46,8 @@
#pragma mark -
#pragma mark Globals
static NPNetscapeFuncs *gNetscapeFuncs; /* Netscape Function table */
short gResFile; // Refnum of the plugin’s resource file
static NPNetscapeFuncs *gNetscapeFuncs; // Function table for procs in Netscape called by plugin
static inline int getMinorVersion() { return gNetscapeFuncs->version & 0xFF; }
......
......@@ -27,6 +27,10 @@
# include "config.h"
#endif
#include <string.h>
#include <stddef.h>
#include <cstring>
#include "../common.h"
#include "../vlcplugin.h"
#include "../vlcshell.h"
......@@ -40,7 +44,6 @@
#define CALL_NPN(unused, FN, ...) ((*FN)(__VA_ARGS__))
#endif
#include <cstring>
#ifdef USE_GTK
# include <gtk/gtk.h>
......@@ -51,6 +54,8 @@
* Globals
*
***********************************************************************/
#pragma mark -
#pragma mark Globals
static NPNetscapeFuncs *gNetscapeFuncs; /* Netscape Function table */
static const char *gUserAgent; /* User agent string */
......
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