#247962MOZILLA_1_8a5_RELEASE

r=pedemonte, sr=wtc, a=mkaply
Patch from mkaply - remove DLL_InitTerm from NSPR - PM switch should happen in app, not NSPR

2 files changed, 0 insertions, 36 deletions

diff --git a/pr/include/md/_os2.h b/pr/include/md/_os2.h
index 9a06d8c5..3539eb6a 100644
--- a/pr/include/md/_os2.h
+++ b/pr/include/md/_os2.h
@@ -570,7 +570,6 @@ typedef struct _CONTEXTRECORD {
 #endif
 
 extern APIRET (* APIENTRY QueryThreadContext)(TID, ULONG, PCONTEXTRECORD);
-unsigned long _System _DLL_InitTerm( unsigned long mod_handle, unsigned long flag);
 
 /*
 #define _pr_tid            (((PTIB2)_getTIBvalue(offsetof(TIB, tib_ptib2)))->tib2_ultid)
diff --git a/pr/src/md/os2/os2misc.c b/pr/src/md/os2/os2misc.c
index 8a4ae9eb..6e330a03 100644
--- a/pr/src/md/os2/os2misc.c
+++ b/pr/src/md/os2/os2misc.c
@@ -564,38 +564,3 @@ PRStatus _MD_CloseFileMap(PRFileMap *fmap)
     return PR_FAILURE;
 }
 
-/*
- *  Automatically set apptype switch for interactive and other
- *  tests that create an invisible plevent window.
- */
-unsigned long _System _DLL_InitTerm( unsigned long mod_handle, unsigned long flag)
-{
-   unsigned long rc = 0; /* failure */
-
-   if( !flag)
-   {
-      /* init */
-      if( _CRT_init() == 0)
-      {
-         PPIB pPib;
-         PTIB pTib;
-
-         /* probably superfluous, but can't hurt */
-         __ctordtorInit(0);
-
-         DosGetInfoBlocks( &pTib, &pPib);
-         pPib->pib_ultype = 3; /* PM */
-
-         rc = 1;
-      }
-   }
-   else
-   {
-      __ctordtorTerm(0);
-      _CRT_term();
-      rc = 1;
-   }
-
-   return rc;
-}
-