Commit 10b9ce70 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf Committed by Rémi Denis-Courmont

Mozilla: fixes for Win32 using the new np headers

parent d9d66c22
......@@ -30,6 +30,8 @@
//#define OJI 1
#include "../vlcplugin.h"
#ifndef _NPAPI_H_
# include "npapi.h"
#endif
......
......@@ -41,11 +41,6 @@
#define MOZ_X11 1
#endif
#include <npapi.h>
#include <vector>
#include "control/nporuntime.h"
#if !defined(XP_MACOSX) && !defined(XP_UNIX) && !defined(XP_WIN)
#define XP_UNIX 1
#elif defined(XP_MACOSX)
......@@ -54,8 +49,8 @@
#ifdef XP_WIN
/* Windows stuff */
# include <winbase.h>
# include <windows.h>
# include <winbase.h>
#endif
#ifdef XP_MACOSX
......@@ -83,6 +78,12 @@
# define __MIN(a, b) ( ((a) < (b)) ? (a) : (b) )
#endif
#include <npapi.h>
#include <vector>
#include "control/nporuntime.h"
typedef struct {
#if defined(XP_UNIX)
pthread_mutex_t mutex;
......
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