necko builds

uriloader/base/nsDocLoader.cpp

@@ -883,7 +883,10 @@ nsDocLoaderImpl::OpenStream(nsIURI *aUrl, nsIStreamListener *aConsumer)
   nsCRT::free(buffer);
 #endif
 #endif /* DEBUG */
+
+#ifndef NECKO
   nsURLLoadType loadType;
+#endif // NECKO
 
   NS_NEWXPCOM(loader, nsDocumentBindInfo);
   if (nsnull == loader) {
@@ -1855,7 +1858,11 @@ nsDocumentBindInfo::OnStartBinding(nsIURI* aURL, const char *aContentType)
             printf("DocLoaderFactory: Unable to create ContentViewer for command=%s, content-type=%s\n", m_Command ? m_Command : "(null)", aContentType);
             if ( m_Container ) {
                 // Give content container a chance to do something with this URL.
+#ifndef NECKO
                 rv = m_Container->HandleUnknownContentType( (nsIDocumentLoader*) m_DocLoader, aURL, aContentType, m_Command );
+#else
+                rv = m_Container->HandleUnknownContentType( (nsIDocumentLoader*) m_DocLoader, channel, aContentType, m_Command );
+#endif // NECKO
             }
             // Stop the binding.
             // This crashes on Unix/Mac... Stop();

webshell/src/nsDocLoader.cpp

@@ -883,7 +883,10 @@ nsDocLoaderImpl::OpenStream(nsIURI *aUrl, nsIStreamListener *aConsumer)
   nsCRT::free(buffer);
 #endif
 #endif /* DEBUG */
+
+#ifndef NECKO
   nsURLLoadType loadType;
+#endif // NECKO
 
   NS_NEWXPCOM(loader, nsDocumentBindInfo);
   if (nsnull == loader) {
@@ -1855,7 +1858,11 @@ nsDocumentBindInfo::OnStartBinding(nsIURI* aURL, const char *aContentType)
             printf("DocLoaderFactory: Unable to create ContentViewer for command=%s, content-type=%s\n", m_Command ? m_Command : "(null)", aContentType);
             if ( m_Container ) {
                 // Give content container a chance to do something with this URL.
+#ifndef NECKO
                 rv = m_Container->HandleUnknownContentType( (nsIDocumentLoader*) m_DocLoader, aURL, aContentType, m_Command );
+#else
+                rv = m_Container->HandleUnknownContentType( (nsIDocumentLoader*) m_DocLoader, channel, aContentType, m_Command );
+#endif // NECKO
             }
             // Stop the binding.
             // This crashes on Unix/Mac... Stop();

webshell/src/nsThrobber.cpp

@@ -448,7 +448,11 @@ nsThrobber::LoadThrobberImages(const nsString& aFileNameMask, PRInt32 aNumImages
   }
 
   nsIDeviceContext *deviceCtx = mWidget->GetDeviceContext();
+#ifndef NECKO
   mImageGroup->Init(deviceCtx, nsnull);
+#else
+  mImageGroup->Init(deviceCtx);
+#endif // NECKO
   NS_RELEASE(deviceCtx);
 
   rv = NS_NewTimer(&mTimer);

webshell/tests/imgtest/ImageTest.cpp

@@ -199,7 +199,12 @@ MyLoadImage(char *aFileName)
     if (gImageGroup == NULL) {
         nsIDeviceContext *deviceCtx = gWindow->GetDeviceContext();
         if (NS_NewImageGroup(&gImageGroup) != NS_OK ||
-            gImageGroup->Init(deviceCtx, nsnull) != NS_OK) {
+#ifndef NECKO
+            gImageGroup->Init(deviceCtx, nsnull) != NS_OK)
+#else
+            gImageGroup->Init(deviceCtx) != NS_OK)
+#endif // NECKO
+        {
                 ::MessageBox(NULL, "Couldn't create image group",
                              class1Name, MB_OK);
                 NS_RELEASE(deviceCtx);