Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-02 03:49:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

# 25555

Browse Source 
r= beard@netscape.com
OS/2 changes for Mozilla - add #ifdef, change #ifdef
This commit is contained in:
mkaply%us.ibm.com 2000-02-28 15:00:30 +00:00
parent 35f9400d4f
commit 5eb928c520
6 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/plugin/base/public/nsplugindefs.h
View File

@ -38,12 +38,15 @@
#ifndef nsplugindefs_h___
#define nsplugindefs_h___
#ifndef prtypes_h___
#include "prtypes.h"
#if defined(XP_OS2) || defined(__OS2__)
#pragma pack(1)
#define INCL_BASE
#define INCL_PM
#include <os2.h>
#endif
#ifdef __OS2__
#pragma pack(1)
#ifndef prtypes_h___
#include "prtypes.h"
#endif
#ifdef XP_MAC
@ -57,7 +60,7 @@
# include <X11/Xutil.h>
#endif
#ifdef XP_PC
#if defined(XP_PC) && !defined(XP_OS2)
# include <windef.h>
#endif
@ -297,13 +300,13 @@ struct nsPluginEvent {
EventRecord* event;
nsPluginPlatformWindowRef window;
#elif defined(XP_PC)
uint16 event;
#elif defined(XP_OS2)
uint32 event;
uint32 wParam;
uint32 lParam;
#elif defined(XP_OS2)
uint32 event;
#elif defined(XP_PC)
uint16 event;
uint32 wParam;
uint32 lParam;

2
modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@ -58,7 +58,7 @@
#include "nsDiskModule.h"
#endif
#ifdef XP_PC
#if defined(XP_PC) && !defined(XP_OS2)
#include "windows.h"
#include "winbase.h"
#endif

6
modules/plugin/base/src/nsPluginInstancePeer.cpp
View File

@ -39,7 +39,7 @@
#include "nsIScriptGlobalObject.h"
#include "nsIScriptObjectOwner.h"
#ifdef XP_PC
#if defined(XP_PC) && !defined(XP_OS2)
#include "windows.h"
#include "winbase.h"
#endif
@ -200,7 +200,11 @@ nsPluginStreamToFile::nsPluginStreamToFile(const char* target, nsIPluginInstance
// open the file and prepare it for writing
char buf[400], tpath[300];
#ifdef XP_PC
#ifdef XP_OS2
PL_strcpy(tpath, getenv("TEMP"));
#else
::GetTempPath(sizeof(tpath), tpath);
#endif
PRInt32 len = PL_strlen(tpath);
if ((len > 0) && (tpath[len-1] != '\\'))

2
modules/plugin/nglsrc/nsPluginHostImpl.cpp
View File

@ -58,7 +58,7 @@
#include "nsDiskModule.h"
#endif
#ifdef XP_PC
#if defined(XP_PC) && !defined(XP_OS2)
#include "windows.h"
#include "winbase.h"
#endif

6
modules/plugin/nglsrc/nsPluginInstancePeer.cpp
View File

@ -39,7 +39,7 @@
#include "nsIScriptGlobalObject.h"
#include "nsIScriptObjectOwner.h"
#ifdef XP_PC
#if defined(XP_PC) && !defined(XP_OS2)
#include "windows.h"
#include "winbase.h"
#endif
@ -200,7 +200,11 @@ nsPluginStreamToFile::nsPluginStreamToFile(const char* target, nsIPluginInstance
// open the file and prepare it for writing
char buf[400], tpath[300];
#ifdef XP_PC
#ifdef XP_OS2
PL_strcpy(tpath, getenv("TEMP"));
#else
::GetTempPath(sizeof(tpath), tpath);
#endif
PRInt32 len = PL_strlen(tpath);
if ((len > 0) && (tpath[len-1] != '\\'))

21
modules/plugin/public/nsplugindefs.h
View File

@ -38,12 +38,15 @@
#ifndef nsplugindefs_h___
#define nsplugindefs_h___
#ifndef prtypes_h___
#include "prtypes.h"
#if defined(XP_OS2) || defined(__OS2__)
#pragma pack(1)
#define INCL_BASE
#define INCL_PM
#include <os2.h>
#endif
#ifdef __OS2__
#pragma pack(1)
#ifndef prtypes_h___
#include "prtypes.h"
#endif
#ifdef XP_MAC
@ -57,7 +60,7 @@
# include <X11/Xutil.h>
#endif
#ifdef XP_PC
#if defined(XP_PC) && !defined(XP_OS2)
# include <windef.h>
#endif
@ -297,13 +300,13 @@ struct nsPluginEvent {
EventRecord* event;
nsPluginPlatformWindowRef window;
#elif defined(XP_PC)
uint16 event;
#elif defined(XP_OS2)
uint32 event;
uint32 wParam;
uint32 lParam;
#elif defined(XP_OS2)
uint32 event;
#elif defined(XP_PC)
uint16 event;
uint32 wParam;
uint32 lParam;