diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | embed/mozilla/GlobalHistory.cpp | 6 |
2 files changed, 8 insertions, 4 deletions
@@ -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 () { |