From f05f8318294f07957863b166ca316b8df1bcbd4e Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@novell.com>
Date: Sat, 21 May 2011 16:34:45 +0300
Subject: Drop OS2

---
 np_sdk/mozsrc/jri_md.h    | 12 +-----------
 np_sdk/mozsrc/makefile.mk |  2 +-
 np_sdk/mozsrc/npapi.h     | 24 ------------------------
 np_sdk/mozsrc/npupp.h     | 31 ++-----------------------------
 np_sdk/mozsrc/npwin.cpp   |  6 ------
 5 files changed, 4 insertions(+), 71 deletions(-)

(limited to 'np_sdk/mozsrc')

diff --git a/np_sdk/mozsrc/jri_md.h b/np_sdk/mozsrc/jri_md.h
index fed7ff5f60fb..e5df4dbd3d56 100644
--- a/np_sdk/mozsrc/jri_md.h
+++ b/np_sdk/mozsrc/jri_md.h
@@ -68,17 +68,7 @@ extern "C" {
 /* DLL Entry modifiers... */
 
 /* PC */
-#if defined(XP_OS2)
-#  ifdef XP_OS2_VACPP
-#     define JRI_PUBLIC_API(ResultType)     ResultType _Optlink
-#     define JRI_PUBLIC_VAR(VarType)        VarType
-#     define JRI_CALLBACK
-#  else
-#     define JRI_PUBLIC_API(ResultType)     ResultType
-#     define JRI_PUBLIC_VAR(VarType)        VarType
-#     define JRI_CALLBACK
-#  endif
-#elif defined(XP_PC) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32)
+#if defined(XP_PC) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32)
 #   include <windows.h>
 #   if defined(_MSC_VER) || defined(__MINGW32__)
 #       if defined(WIN32) || defined(_WIN32)
diff --git a/np_sdk/mozsrc/makefile.mk b/np_sdk/mozsrc/makefile.mk
index 1172a381e2e3..248cb6d5091c 100644
--- a/np_sdk/mozsrc/makefile.mk
+++ b/np_sdk/mozsrc/makefile.mk
@@ -41,7 +41,7 @@ JDKINCS=
 
 # --- Files --------------------------------------------------------
 
-.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)" == "WNT"
 MOZFILES = $(SLO)$/npwin.obj
 .ELSE
 MOZFILES = $(SLO)$/npunix.obj
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_ */
diff --git a/np_sdk/mozsrc/npupp.h b/np_sdk/mozsrc/npupp.h
index 6d433f1afb00..58ce6c8d4e57 100644
--- a/np_sdk/mozsrc/npupp.h
+++ b/np_sdk/mozsrc/npupp.h
@@ -46,10 +46,6 @@
 #ifndef _NPUPP_H_
 #define _NPUPP_H_
 
-#if defined(__OS2__)
-#pragma pack(1)
-#endif
-
 #ifndef GENERATINGCFM
 #define GENERATINGCFM 0
 #endif
@@ -1223,35 +1219,16 @@ typedef OSErr (* NP_LOADDS BP_GetSupportedMIMETypesUPP)(BPSupportedMIMETypes*, U
 #if defined(_WINDOWS)
 #define OSCALL WINAPI
 #else
-#if defined(__OS2__)
-#define OSCALL _System
-#else
 #define OSCALL
 #endif
-#endif
 
-#if defined( _WINDOWS ) || defined (__OS2__)
+#if defined( _WINDOWS )
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /* plugin meta member functions */
-#if defined(__OS2__)
-
-typedef struct _NPPluginData {   /* Alternate OS2 Plugin interface */
-    char *pMimeTypes;
-    char *pFileExtents;
-    char *pFileOpenTemplate;
-    char *pProductName;
-    char *pProductDescription;
-    unsigned long dwProductVersionMS;
-    unsigned long dwProductVersionLS;
-} NPPluginData;
-
-NPError OSCALL NP_GetPluginData(NPPluginData * pPluginData);
-
-#endif
 
 NPError OSCALL NP_GetEntryPoints(NPPluginFuncs* pFuncs);
 
@@ -1265,11 +1242,7 @@ char*   NP_GetMIMEDescription();
 }
 #endif
 
-#endif /* _WINDOWS || __OS2__ */
-
-#if defined(__OS2__)
-#pragma pack()
-#endif
+#endif /* _WINDOWS */
 
 #ifdef XP_UNIX
 
diff --git a/np_sdk/mozsrc/npwin.cpp b/np_sdk/mozsrc/npwin.cpp
index 2855290529ab..b8f3407aaf9d 100644
--- a/np_sdk/mozsrc/npwin.cpp
+++ b/np_sdk/mozsrc/npwin.cpp
@@ -45,12 +45,6 @@
 //\\// DEFINE
 #define NP_EXPORT
 
-#ifdef OS2
-#define WINAPI _System
-#define HIBYTE(a) (a>>8)
-#define LOBYTE(a) (a&0xFF)
-#endif
-
 //\\// GLOBAL DATA
 NPNetscapeFuncs* g_pNavigatorFuncs = 0;
 
-- 
cgit