equal
deleted
inserted
replaced
4 https://bugzilla.mozilla.org/show_bug.cgi?id=517655 |
4 https://bugzilla.mozilla.org/show_bug.cgi?id=517655 |
5 |
5 |
6 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in |
6 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in |
7 --- a/config/autoconf.mk.in |
7 --- a/config/autoconf.mk.in |
8 +++ b/config/autoconf.mk.in |
8 +++ b/config/autoconf.mk.in |
9 @@ -537,16 +537,20 @@ FT2_CFLAGS = @FT2_CFLAGS@ |
9 @@ -539,16 +539,20 @@ FT2_CFLAGS = @FT2_CFLAGS@ |
10 FT2_LIBS = @FT2_LIBS@ |
10 FT2_LIBS = @FT2_LIBS@ |
11 |
11 |
12 MOZ_PANGO_CFLAGS = @MOZ_PANGO_CFLAGS@ |
12 MOZ_PANGO_CFLAGS = @MOZ_PANGO_CFLAGS@ |
13 MOZ_PANGO_LIBS = @MOZ_PANGO_LIBS@ |
13 MOZ_PANGO_LIBS = @MOZ_PANGO_LIBS@ |
14 |
14 |
28 GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ |
28 GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ |
29 LIBIDL_CFLAGS = @LIBIDL_CFLAGS@ |
29 LIBIDL_CFLAGS = @LIBIDL_CFLAGS@ |
30 diff --git a/config/system-headers b/config/system-headers |
30 diff --git a/config/system-headers b/config/system-headers |
31 --- a/config/system-headers |
31 --- a/config/system-headers |
32 +++ b/config/system-headers |
32 +++ b/config/system-headers |
33 @@ -1012,8 +1012,11 @@ hunspell.hxx |
33 @@ -1013,8 +1013,11 @@ hunspell.hxx |
34 #if MOZ_NATIVE_BZ2==1 |
34 #if MOZ_NATIVE_BZ2==1 |
35 bzlib.h |
35 bzlib.h |
36 #endif |
36 #endif |
37 #if MOZ_PLATFORM_MAEMO==5 |
37 #if MOZ_PLATFORM_MAEMO==5 |
38 hildon-uri.h |
38 hildon-uri.h |
307 + } |
307 + } |
308 + |
308 + |
309 + c++; |
309 + c++; |
310 + } |
310 + } |
311 + |
311 + |
312 +printf("returned PAC proxy string: %s\n", PromiseFlatCString(aResult).get()); |
312 +//printf("returned PAC proxy string: %s\n", PromiseFlatCString(aResult).get()); |
313 + |
313 + |
314 + PR_Free(proxyArray); |
314 + PR_Free(proxyArray); |
315 + return NS_OK; |
315 + return NS_OK; |
316 +} |
316 +} |
317 + |
317 + |