From bc24633161a5fb5ed8c62e27915e077c074c7ff6 Mon Sep 17 00:00:00 2001
From: "mcafee%netscape.com"
 <mcafee%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 18 Aug 1998 07:47:59 +0000
Subject: [PATCH] Adding support for Unix && NO_X11

git-svn-id: svn://10.0.0.236/trunk@8119 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/include/npapi.h                    | 10 ++++++----
 mozilla/modules/plugin/base/public/npapi.h | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/mozilla/include/npapi.h b/mozilla/include/npapi.h
index 3ae8e364641..65864567363 100644
--- a/mozilla/include/npapi.h
+++ b/mozilla/include/npapi.h
@@ -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;
diff --git a/mozilla/modules/plugin/base/public/npapi.h b/mozilla/modules/plugin/base/public/npapi.h
index 3ae8e364641..65864567363 100644
--- a/mozilla/modules/plugin/base/public/npapi.h
+++ b/mozilla/modules/plugin/base/public/npapi.h
@@ -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;