Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding support for non-X11 Unix systems

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@10488 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mcafee%netscape.com
1998-09-19 06:21:01 +00:00
parent dbab632bf4
commit 201d6cafda
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/modules/plugin/base/public/nsplugindefs.h
View File

@@ -48,7 +48,7 @@
# include <MacWindows.h>
#endif
#ifdef XP_UNIX
#if defined(XP_UNIX) && !defined(NO_X11)
# include <X11/Xlib.h>
# include <X11/Xutil.h>
#endif
@@ -149,6 +149,7 @@ struct nsPluginAnyCallbackStruct {
PRInt32 type;
};
#ifndef NO_X11
struct nsPluginSetWindowCallbackStruct {
PRInt32 type;
Display* display;
@@ -156,6 +157,12 @@ struct nsPluginSetWindowCallbackStruct {
Colormap colormap;
PRUint32 depth;
};
#else
struct nsPluginSetWindowCallbackStruct {
PRInt32 type;
};
#endif
struct nsPluginPrintCallbackStruct {
PRInt32 type;
@@ -228,7 +235,7 @@ struct nsPluginPort;
typedef HRGN nsPluginRegion;
typedef HWND nsPluginPlatformWindowRef;
#elif defined(XP_UNIX)
#elif defined(XP_UNIX) && !defined(NO_X11)
struct nsPluginPort;
typedef Region nsPluginRegion;
@@ -296,9 +303,10 @@ struct nsPluginEvent {
uint32 wParam;
uint32 lParam;
#elif defined(XP_UNIX)
#elif defined(XP_UNIX) && !defined(NO_X11)
XEvent event;
#else
void *event;
#endif
};

16
mozilla/modules/plugin/public/nsplugindefs.h
View File

@@ -48,7 +48,7 @@
# include <MacWindows.h>
#endif
#ifdef XP_UNIX
#if defined(XP_UNIX) && !defined(NO_X11)
# include <X11/Xlib.h>
# include <X11/Xutil.h>
#endif
@@ -149,6 +149,7 @@ struct nsPluginAnyCallbackStruct {
PRInt32 type;
};
#ifndef NO_X11
struct nsPluginSetWindowCallbackStruct {
PRInt32 type;
Display* display;
@@ -156,6 +157,12 @@ struct nsPluginSetWindowCallbackStruct {
Colormap colormap;
PRUint32 depth;
};
#else
struct nsPluginSetWindowCallbackStruct {
PRInt32 type;
};
#endif
struct nsPluginPrintCallbackStruct {
PRInt32 type;
@@ -228,7 +235,7 @@ struct nsPluginPort;
typedef HRGN nsPluginRegion;
typedef HWND nsPluginPlatformWindowRef;
#elif defined(XP_UNIX)
#elif defined(XP_UNIX) && !defined(NO_X11)
struct nsPluginPort;
typedef Region nsPluginRegion;
@@ -296,9 +303,10 @@ struct nsPluginEvent {
uint32 wParam;
uint32 lParam;
#elif defined(XP_UNIX)
#elif defined(XP_UNIX) && !defined(NO_X11)
XEvent event;
#else
void *event;
#endif
};