diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
index 83f760d4fd1..33c7b750920 100644
--- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp
+++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
@@ -3977,10 +3977,6 @@ NS_IMETHODIMP
 HTMLContentSink::DidProcessAToken(void)
 {
   if (mFlags & NS_SINK_FLAG_CAN_INTERRUPT_PARSER) {
-#ifdef NS_DEBUG
-    PRInt32 oldMaxTokenProcessingTime = GetMaxTokenProcessingTime();
-#endif
-
     // There is both a high frequency interrupt mode and a low
     // frequency interupt mode controlled by the flag
     // NS_SINK_FLAG_DYNAMIC_LOWER_VALUE The high frequency mode
@@ -4090,17 +4086,6 @@ HTMLContentSink::DidProcessAToken(void)
       }
     }
 
-#ifdef NS_DEBUG
-#if 0
-    PRInt32 newMaxTokenProcessingTime = GetMaxTokenProcessingTime();
-
-    if (newMaxTokenProcessingTime != oldMaxTokenProcessingTime) {
-      printf("Changed dynamic interval : MaxTokenProcessingTime %d\n",
-             GetMaxTokenProcessingTime());
-    }
-#endif
-#endif
-
     if ((currentTime - mDelayTimerStart) >
         NS_STATIC_CAST(PRUint32, GetMaxTokenProcessingTime())) {
       return NS_ERROR_HTMLPARSER_INTERRUPTED;
diff --git a/mozilla/htmlparser/src/nsScanner.cpp b/mozilla/htmlparser/src/nsScanner.cpp
index 615283bff97..4de37f7d7fe 100644
--- a/mozilla/htmlparser/src/nsScanner.cpp
+++ b/mozilla/htmlparser/src/nsScanner.cpp
@@ -1349,7 +1349,7 @@ nsresult nsScanner::ReadUntil(nsAString& aString,
   current = origin;
 
   PRUnichar theChar;
-  nsresult  result=Peek(theChar);
+  Peek(theChar);
   
   while (current != mEndPosition) {
     if (aTerminalChar == theChar) {
diff --git a/mozilla/modules/oji/src/lcglue.cpp b/mozilla/modules/oji/src/lcglue.cpp
index bf98f5b967d..a43d7662bed 100644
--- a/mozilla/modules/oji/src/lcglue.cpp
+++ b/mozilla/modules/oji/src/lcglue.cpp
@@ -166,12 +166,6 @@ map_jsj_thread_to_js_context_impl(JSJavaThreadState *jsj_env, void* java_applet_
 #endif
 }
 
-JS_STATIC_DLL_CALLBACK(void) detach_jsjava_thread_state(void* env)
-{
-    JSJavaThreadState *jsj_env = NS_REINTERPRET_CAST(JSJavaThreadState*, env);
-    JSJ_DetachCurrentThreadFromJava(jsj_env);
-}
-
 /*
 ** This callback is called to map a JSContext to a JSJavaThreadState which
 ** is a wrapper around JNIEnv. Hence this callback essentially maps a JSContext
diff --git a/mozilla/parser/htmlparser/src/nsScanner.cpp b/mozilla/parser/htmlparser/src/nsScanner.cpp
index 615283bff97..4de37f7d7fe 100644
--- a/mozilla/parser/htmlparser/src/nsScanner.cpp
+++ b/mozilla/parser/htmlparser/src/nsScanner.cpp
@@ -1349,7 +1349,7 @@ nsresult nsScanner::ReadUntil(nsAString& aString,
   current = origin;
 
   PRUnichar theChar;
-  nsresult  result=Peek(theChar);
+  Peek(theChar);
   
   while (current != mEndPosition) {
     if (aTerminalChar == theChar) {