diff options
author | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-21 16:34:45 +0300 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-21 16:34:45 +0300 |
commit | f05f8318294f07957863b166ca316b8df1bcbd4e (patch) | |
tree | cf6438981b1bfc3538dfe9ef1b70a45a353736e9 /np_sdk/mozsrc/npapi.h | |
parent | Check OS_FOR_BUILD, not OS (diff) | |
download | core-f05f8318294f07957863b166ca316b8df1bcbd4e.tar.gz core-f05f8318294f07957863b166ca316b8df1bcbd4e.zip |
Drop OS2
Diffstat (limited to 'np_sdk/mozsrc/npapi.h')
-rw-r--r-- | np_sdk/mozsrc/npapi.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/np_sdk/mozsrc/npapi.h b/np_sdk/mozsrc/npapi.h index ef2b21a6223f..aa90fa25aaef 100644 --- a/np_sdk/mozsrc/npapi.h +++ b/np_sdk/mozsrc/npapi.h @@ -45,18 +45,8 @@ #ifndef _NPAPI_H_ #define _NPAPI_H_ -#ifdef __OS2__ -#pragma pack(1) -#endif - #include "jri.h" /* Java Runtime Interface */ -#if defined (__OS2__ ) || defined (OS2) -# ifndef XP_OS2 -# define XP_OS2 1 -# endif /* XP_OS2 */ -#endif /* __OS2__ */ - #ifdef _WINDOWS # ifndef XP_WIN # define XP_WIN 1 @@ -388,13 +378,6 @@ typedef struct _NPEvent uint32 wParam; uint32 lParam; } NPEvent; -#elif defined(XP_OS2) -typedef struct _NPEvent -{ - uint32 event; - uint32 wParam; - uint32 lParam; -} NPEvent; #elif defined (XP_UNIX) && !defined(NO_X11) typedef XEvent NPEvent; #else @@ -521,12 +504,8 @@ enum NPEventType { #if defined(_WINDOWS) && !defined(WIN32) #define NP_LOADDS _loadds #else -#if defined(__OS2__) -#define NP_LOADDS _System -#else #define NP_LOADDS #endif -#endif #ifdef __cplusplus extern "C" { @@ -603,8 +582,5 @@ void NP_LOADDS NPN_ForceRedraw(NPP instance); #endif #endif /* RC_INVOKED */ -#ifdef __OS2__ -#pragma pack() -#endif #endif /* _NPAPI_H_ */ |