File thunderbird-gcc4.3-fixes.patch of Package MozillaThunderbird

diff --git a/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h b/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h
index 8a63354..019d35d 100644
--- a/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h
+++ b/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h
@@ -39,8 +39,10 @@
 #include "imgIEncoder.h"
 #ifdef MOZILLA_1_8_BRANCH
 #define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH
+#ifndef NS_DECL_IMGIENCODER
 #define NS_DECL_IMGIENCODER NS_DECL_IMGIENCODER_MOZILLA_1_8_BRANCH
 #endif
+#endif
 
 // needed for JPEG library
 #include <stdio.h>
@@ -69,6 +71,14 @@ public:
 
   nsJPEGEncoder();
 
+  NS_IMETHOD InitFromData(const PRUint8* aData,
+                          PRUint32 aLength, // (unused, req'd by JS)
+                          PRUint32 aWidth,
+                          PRUint32 aHeight,
+                          PRUint32 aStride,
+                          PRUint32 aInputFormat,
+                          const nsAString& aOutputOptions);
+
 private:
   ~nsJPEGEncoder();
 
diff --git a/modules/libpr0n/encoders/png/nsPNGEncoder.h b/modules/libpr0n/encoders/png/nsPNGEncoder.h
index ff85949..83766f1 100644
--- a/modules/libpr0n/encoders/png/nsPNGEncoder.h
+++ b/modules/libpr0n/encoders/png/nsPNGEncoder.h
@@ -38,8 +38,10 @@
 #include "imgIEncoder.h"
 #ifdef MOZILLA_1_8_BRANCH
 #define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH
+#ifndef NS_DECL_IMGIENCODER
 #define NS_DECL_IMGIENCODER NS_DECL_IMGIENCODER_MOZILLA_1_8_BRANCH
 #endif
+#endif
 
 #include <png.h>
 
@@ -63,6 +65,14 @@ public:
 
   nsPNGEncoder();
 
+  NS_IMETHOD InitFromData(const PRUint8* aData,
+                          PRUint32 aLength, // (unused, req'd by JS)
+                          PRUint32 aWidth,
+                          PRUint32 aHeight,
+                          PRUint32 aStride,
+                          PRUint32 aInputFormat,
+                          const nsAString& aOutputOptions);
+
 private:
   ~nsPNGEncoder();
 
diff --git a/modules/libpr0n/public/imgIContainer.idl b/modules/libpr0n/public/imgIContainer.idl
index f975b16..4819158 100644
--- a/modules/libpr0n/public/imgIContainer.idl
+++ b/modules/libpr0n/public/imgIContainer.idl
@@ -38,7 +38,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsISupports.idl"
-#include "gfxtypes.idl"
+#include <gfxtypes.idl>
 #include "gfxIFormats.idl"
 
 interface gfxIImageFrame;
diff --git a/modules/libpr0n/public/imgIEncoder.idl b/modules/libpr0n/public/imgIEncoder.idl
index 120b3bf..562bf42 100755
--- a/modules/libpr0n/public/imgIEncoder.idl
+++ b/modules/libpr0n/public/imgIEncoder.idl
@@ -96,6 +96,6 @@ interface nsIFile;
 [scriptable, uuid(CCC5B3AD-3E67-4e3d-97E1-B06B2E96FEF8)]
 interface imgIEncoder : nsISupports
 {
-  void encodeClipboardImage(in nsIClipboardImage aClipboardImage, out nsIFile aImageFile);
+  /* void encodeClipboardImage(in nsIClipboardImage aClipboardImage, out nsIFile aImageFile); */
 };
 
diff --git a/xpcom/obsolete/component/nsFileSpecImpl.h b/xpcom/obsolete/component/nsFileSpecImpl.h
index 502e254..0e51950 100644
--- a/xpcom/obsolete/component/nsFileSpecImpl.h
+++ b/xpcom/obsolete/component/nsFileSpecImpl.h
@@ -58,7 +58,7 @@ class nsFileSpecImpl
 	// COM Cruft
 	//----------------------
 
-	static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void* *aIFileSpec);
+	/* static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void* *aIFileSpec); */
 
 	//----------------------
 	// Implementation
@@ -104,7 +104,7 @@ public:
 	// COM Cruft
 	//----------------------
 
-	static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void* *aIFileSpec);
+	/* static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void* *aIFileSpec); */
 
 private:
 	~nsDirectoryIteratorImpl();
diff --git a/xpcom/obsolete/component/nsXPCOMObsolete.cpp b/xpcom/obsolete/component/nsXPCOMObsolete.cpp
index 9a71a91..03ac666 100644
--- a/xpcom/obsolete/component/nsXPCOMObsolete.cpp
+++ b/xpcom/obsolete/component/nsXPCOMObsolete.cpp
@@ -48,8 +48,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsRegistry)
 
 static const nsModuleComponentInfo components[] =
 {
-    COMPONENT(FILESPEC, nsFileSpecImpl::Create),
-    COMPONENT(DIRECTORYITERATOR, nsDirectoryIteratorImpl::Create),
+/*    COMPONENT(FILESPEC, nsFileSpecImpl::Create),
+      COMPONENT(DIRECTORYITERATOR, nsDirectoryIteratorImpl::Create), */
     COMPONENT(REGISTRY, nsRegistryConstructor),
 };
 
diff --git a/xpcom/obsolete/nsXPCOMObsolete.cpp b/xpcom/obsolete/nsXPCOMObsolete.cpp
index 45391c0..10b2060 100644
--- a/xpcom/obsolete/nsXPCOMObsolete.cpp
+++ b/xpcom/obsolete/nsXPCOMObsolete.cpp
@@ -46,8 +46,8 @@
 
 static const nsModuleComponentInfo components[] =
 {
-  COMPONENT(FILESPEC, nsFileSpecImpl::Create),
-  COMPONENT(DIRECTORYITERATOR, nsDirectoryIteratorImpl::Create),
+    COMPONENT(FILESPEC, nsFileSpecImpl::Create),
+    COMPONENT(DIRECTORYITERATOR, nsDirectoryIteratorImpl::Create),
 };
 
 NS_IMPL_NSGETMODULE(xpcomObsoleteModule, components)