From a9dd77b4e9c69b335f1230dff9a0811d0794da2c Mon Sep 17 00:00:00 2001
From: Oleg Romashin <romaxa@gmail.com>
Date: Sat, 16 Aug 2008 03:06:39 -0400
Subject: [PATCH] Fixed bug 449566 cairo-qpainter-surface.cpp fails to compile
 with gcc 4.3.x, r=pavlov

---
 embedding/browser/qt/tests/TestQGeckoEmbed.cpp | 1 +
 gfx/cairo/cairo/src/cairo-qpainter-surface.cpp | 1 +
 widget/src/qt/nsWindow.h                       | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/embedding/browser/qt/tests/TestQGeckoEmbed.cpp b/embedding/browser/qt/tests/TestQGeckoEmbed.cpp
index 96c101c05fa1..7573bffcbc15 100644
--- a/embedding/browser/qt/tests/TestQGeckoEmbed.cpp
+++ b/embedding/browser/qt/tests/TestQGeckoEmbed.cpp
@@ -6,6 +6,7 @@
 #include "jprof/jprof.h"
 #endif
 
+#include <limits.h>
 #include <qdir.h>
 
 int main(int argc, char **argv)
diff --git a/gfx/cairo/cairo/src/cairo-qpainter-surface.cpp b/gfx/cairo/cairo/src/cairo-qpainter-surface.cpp
index 584f392a30aa..288bc246cdfa 100644
--- a/gfx/cairo/cairo/src/cairo-qpainter-surface.cpp
+++ b/gfx/cairo/cairo/src/cairo-qpainter-surface.cpp
@@ -40,6 +40,7 @@
 #include "cairoint.h"
 
 #include "cairo-qpainter.h"
+#include <memory>
 
 #include <QtGui/QPainter>
 #include <QtGui/QPaintEngine>
diff --git a/widget/src/qt/nsWindow.h b/widget/src/qt/nsWindow.h
index f6822ed608b8..27c8da580844 100644
--- a/widget/src/qt/nsWindow.h
+++ b/widget/src/qt/nsWindow.h
@@ -351,7 +351,7 @@ private:
     void              *SetupPluginPort(void);
     nsresult           SetWindowIconList(const nsCStringArray &aIconList);
     void               SetDefaultIcon(void);
-    void               InitButtonEvent(nsMouseEvent &aEvent, QMouseEvent *aEvent, int aClickCount = 1);
+    void               InitButtonEvent(nsMouseEvent &event, QMouseEvent *aEvent, int aClickCount = 1);
     PRBool             DispatchCommandEvent(nsIAtom* aCommand);
     QWidget           *createQWidget(QWidget *parent, nsWidgetInitData *aInitData);