aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-02-16 19:56:51 +0800
committerChristian Persch <chpe@src.gnome.org>2004-02-16 19:56:51 +0800
commit9abf331ee6fe82d4e221fe57bde51da7db0a9a33 (patch)
tree3be075c18e70ecce9c4f82f7d3864555eb4d8942
parent088728be26eb23ff5d1fcb9b742475c3d3a22daa (diff)
downloadgsoc2013-epiphany-9abf331ee6fe82d4e221fe57bde51da7db0a9a33.tar
gsoc2013-epiphany-9abf331ee6fe82d4e221fe57bde51da7db0a9a33.tar.gz
gsoc2013-epiphany-9abf331ee6fe82d4e221fe57bde51da7db0a9a33.tar.bz2
gsoc2013-epiphany-9abf331ee6fe82d4e221fe57bde51da7db0a9a33.tar.lz
gsoc2013-epiphany-9abf331ee6fe82d4e221fe57bde51da7db0a9a33.tar.xz
gsoc2013-epiphany-9abf331ee6fe82d4e221fe57bde51da7db0a9a33.tar.zst
gsoc2013-epiphany-9abf331ee6fe82d4e221fe57bde51da7db0a9a33.zip
Don't use #if inside a macro. Fixe compilation with gcc 3.2.2.
2004-02-16 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/GlobalHistory.cpp: Don't use #if inside a macro. Fixe compilation with gcc 3.2.2.
-rw-r--r--ChangeLog6
-rw-r--r--embed/mozilla/GlobalHistory.cpp6
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 635fd6cd6..7921dad2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-16 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/mozilla/GlobalHistory.cpp:
+
+ Don't use #if inside a macro. Fixe compilation with gcc 3.2.2.
+
2004-02-15 Christian Persch <chpe@cvs.gnome.org>
* embed/mozilla/FilePicker.cpp: (::AppendFilter):
diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp
index f2df7203b..dc836dc97 100644
--- a/embed/mozilla/GlobalHistory.cpp
+++ b/embed/mozilla/GlobalHistory.cpp
@@ -30,13 +30,11 @@
#include <nsString.h>
#include <nsIURI.h>
-NS_IMPL_ISUPPORTS2(MozGlobalHistory,
#if MOZILLA_SNAPSHOT > 13
- nsIGlobalHistory2,
+NS_IMPL_ISUPPORTS2(MozGlobalHistory, nsIGlobalHistory2, nsIBrowserHistory)
#else
- nsIGlobalHistory,
+NS_IMPL_ISUPPORTS2(MozGlobalHistory, nsIGlobalHistory, nsIBrowserHistory)
#endif
- nsIBrowserHistory)
MozGlobalHistory::MozGlobalHistory ()
{