diff options
| author | adamw <adamw@FreeBSD.org> | 2004-07-20 00:36:24 +0000 |
|---|---|---|
| committer | adamw <adamw@FreeBSD.org> | 2004-07-20 00:36:24 +0000 |
| commit | 2f8ad8c8d03ac9d6efd1a131600f2144a0ed4390 (patch) | |
| tree | 52de56ce37c9ec9bffdd24ebb6710ed4260940f7 /www/epiphany-extensions/files | |
| parent | 3bed5e303ca773ddb482ba5a997e25b1a5a46970 (diff) | |
| download | FreeBSD-ports-2f8ad8c8d03ac9d6efd1a131600f2144a0ed4390.zip FreeBSD-ports-2f8ad8c8d03ac9d6efd1a131600f2144a0ed4390.tar.gz | |
Fix build with mozilla-devel.
All the work for this was done by marcus.
Diffstat (limited to 'www/epiphany-extensions/files')
| -rw-r--r-- | www/epiphany-extensions/files/patch-extensions_popup-blocker_mozilla_mozilla-helpers.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/www/epiphany-extensions/files/patch-extensions_popup-blocker_mozilla_mozilla-helpers.cpp b/www/epiphany-extensions/files/patch-extensions_popup-blocker_mozilla_mozilla-helpers.cpp index 1ac27b2..ffc2b64 100644 --- a/www/epiphany-extensions/files/patch-extensions_popup-blocker_mozilla_mozilla-helpers.cpp +++ b/www/epiphany-extensions/files/patch-extensions_popup-blocker_mozilla_mozilla-helpers.cpp @@ -1,5 +1,5 @@ ---- extensions/popup-blocker/mozilla/mozilla-helpers.cpp.orig Wed Jul 7 15:55:52 2004 -+++ extensions/popup-blocker/mozilla/mozilla-helpers.cpp Wed Jul 7 15:57:58 2004 +--- extensions/popup-blocker/mozilla/mozilla-helpers.cpp.orig Mon Mar 15 17:07:05 2004 ++++ extensions/popup-blocker/mozilla/mozilla-helpers.cpp Mon Jul 19 20:33:33 2004 @@ -65,12 +65,16 @@ nsCOMPtr<nsPIDOMWindow> piWin(do_QueryInterface (domWindow, &rv)); NS_ENSURE_SUCCESS (rv, NULL); @@ -17,3 +17,15 @@ NS_ENSURE_SUCCESS (rv, NULL); nsCOMPtr<nsIDOMEventTarget> target; +@@ -181,7 +185,11 @@ + g_free (script); + + PRBool isUndefined; ++#if MOZILLA_SNAPSHOT < 18 + nsAutoString ret; ++#else ++ nsAString *ret; ++#endif + context->EvaluateString (aScript, nsnull, nsnull, nsnull, 0, + nsnull, ret, &isUndefined); + |
