removing old NSPR20 and MOCHA #ifdefs

git-svn-id: svn://10.0.0.236/trunk@11250 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/modules/plugin/src/npglue.cpp

@@ -1923,12 +1923,8 @@ npn_memfree (void *ptr)
 
 #ifdef XP_MAC
 /* For the definition of CallCacheFlushers() */
-#ifndef NSPR20
-#include "prmacos.h"
-#else
 #include "MacMemAllocator.h"
 #endif
-#endif
 
 uint32 NP_EXPORT
 npn_memflush(uint32 size)
@@ -2216,9 +2212,7 @@ npn_forceredraw(NPP npp)
 #define JRI_NO_CPLUSPLUS
 #define IMPLEMENT_netscape_plugin_Plugin
 #include "netscape_plugin_Plugin.h"
-#ifdef MOCHA
 #include "libmocha.h"
-#endif /* MOCHA */
 #endif /* JAVA */
 
 #if defined(XP_MAC) && !defined(powerc)
@@ -2937,7 +2931,6 @@ np_newinstance(np_handle *handle, MWContext *cx, NPEmbeddedApp *app,
     */
 
 #endif
-#ifdef MOCHA
     {
         /* only wait on applets if onload flag */
         lo_TopState *top_state = lo_FetchTopState(XP_DOCID(cx));
@@ -2963,7 +2956,6 @@ np_newinstance(np_handle *handle, MWContext *cx, NPEmbeddedApp *app,
             ET_SetPluginWindow(cx, (void *)instance);
         }
     }
-#endif /* MOCHA */
            
     return instance;
     

mozilla/modules/plugin/src/npglue.h

@@ -44,11 +44,9 @@ extern "C" {
 #include "prefapi.h"
 #include "proto.h"
 
-#ifdef MOCHA
 #include "libmocha.h"
 #include "libevent.h"
 #include "layout.h"         /* XXX From ../layout */
-#endif
 
 #ifdef LAYERS
 #include "layers.h"