From 5303f4fc3bc9204e0e487f103980589e88c696d6 Mon Sep 17 00:00:00 2001 From: "cyeh%netscape.com" Date: Thu, 24 Sep 1998 21:09:58 +0000 Subject: [PATCH] remove old MOCHA and NSPR20 #ifdef --- cmd/winfe/mozilla.cpp | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/cmd/winfe/mozilla.cpp b/cmd/winfe/mozilla.cpp index 0bf01613e630..920e877f891a 100644 --- a/cmd/winfe/mozilla.cpp +++ b/cmd/winfe/mozilla.cpp @@ -199,9 +199,6 @@ extern "C" void SECNAV_EarlyInit(void); extern "C" void SECNAV_Init(void); extern "C" int SECNAV_RunInitialSecConfig(void); extern "C" void SECNAV_Shutdown(void); -#ifndef NSPR20 -extern "C" PR_PUBLIC_API(void) PR_Shutdown(void); -#endif /**************************************************************************** * @@ -2394,21 +2391,10 @@ int CNetscapeApp::ExitInstance() // // Free all resources allocated by NSPR... // + #if !defined(_WIN32) -#if defined(OJI) || defined(JAVA) || defined(MOCHA) -#if defined(NSPR20) - /* - * XXX SHould PR_CLeanup be called here? - * - * In nspr10 PR_Shutdown unloads all the dlls - * In nspr20 PR_shutdown is equivalent to the socket shutdown call - * and implict cleanup unloads the dlls for win16 - */ -#else - PR_Shutdown(); + PRCleanup() #endif -#endif -#endif /* OJI || JAVA || MOCHA */ if (theApp.m_bNetworkProfile) { // if we have a network profile command-line we are assuming delete on exit (for now)