Adding support for Unix && NO_X11

git-svn-id: svn://10.0.0.236/trunk@8119 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mcafee%netscape.com
1998-08-18 07:47:59 +00:00
parent 29b92b686f
commit bc24633161
2 changed files with 12 additions and 8 deletions

View File

@@ -18,7 +18,7 @@
/*
* npapi.h $Revision: 3.5 $
* npapi.h $Revision: 3.6 $
* Netscape client plug-in API spec
*/
@@ -63,7 +63,7 @@
#include <Events.h>
#endif
#ifdef XP_UNIX
#if defined(XP_UNIX) && !defined(NO_X11)
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#endif
@@ -254,10 +254,12 @@ typedef struct
typedef struct
{
int32 type;
#ifndef NO_X11
Display* display;
Visual* visual;
Colormap colormap;
unsigned int depth;
#endif
} NPSetWindowCallbackStruct;
typedef struct
@@ -361,7 +363,7 @@ typedef struct _NPEvent
uint32 wParam;
uint32 lParam;
} NPEvent;
#elif defined (XP_UNIX)
#elif defined (XP_UNIX) && !defined(NO_X11)
typedef XEvent NPEvent;
#else
typedef void* NPEvent;
@@ -371,7 +373,7 @@ typedef void* NPEvent;
typedef RgnHandle NPRegion;
#elif defined(XP_WIN)
typedef HRGN NPRegion;
#elif defined(XP_UNIX)
#elif defined(XP_UNIX) && !defined(NO_X11)
typedef Region NPRegion;
#else
typedef void *NPRegion;