1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-29 05:38:00 +00:00

Fix build with mozilla-devel.

All the work for this was done by marcus.
This commit is contained in:
Adam Weinberger 2004-07-20 00:36:24 +00:00
parent ba6f3865e8
commit 4ec8273dcb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=114259
2 changed files with 15 additions and 3 deletions

View File

@ -35,7 +35,7 @@ HEADERS_SUFX=
.if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2"
MOZILLA= mozilla-devel
HEADERS_SUFX= -devel
MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.8a"
MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.8a2"
.else
MOZILLA= mozilla
HEADERS_SUFX=

View File

@ -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);