Removed bogus npupp.h -- clean one on mozilla/include

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

mozilla/modules/plugin/src/Makefile

@@ -24,7 +24,7 @@ CSRCS		= npassoc.c
 
 CPPSRCS		= nsplugin.cpp
 
-EXPORTS		= nppg.h npupp.h npglue.h nppriv.h
+EXPORTS		= nppg.h npglue.h nppriv.h
 
 REQUIRES	= lay layer js style applet nspr dbm img util java pref xpcom netcnvts oji ojiimpl
 

mozilla/modules/plugin/src/makefile.win

@@ -23,7 +23,6 @@ MODULE	= plugimpl
 
 EXPORTS =        \
         nppg.h   \
-        npupp.h  \
         npglue.h \
         nppriv.h
 

mozilla/modules/plugin/src/npglue.cpp

@@ -2280,7 +2280,7 @@ npn_getJavaClass(np_handle* handle)
     else if (handle && handle->f) {
         JNIEnv* env = npn_getJavaEnv(NULL);		/* may start up the java runtime */
         if (env == NULL) return NULL;
-        return (jclass) env->NewGlobalRef(handle->f->javaClass);
+        return (jclass) env->NewGlobalRef((jobject)handle->f->javaClass);
     }
     return NULL;
 }
@@ -2578,7 +2578,7 @@ np_UnloadPluginClass(np_handle *handle)
 		/* Don't get the environment unless there is a Java class,
 		   because this would cause the java runtime to start up. */
 		JNIEnv* env = npn_getJavaEnv(NULL);
-		env->DeleteGlobalRef(handle->f->javaClass);
+		env->DeleteGlobalRef((jobject)handle->f->javaClass);
 		handle->f->javaClass = NULL;
 	}
 #elif defined(JAVA)