From 6ed0bbfee04a1b59c3545a09dad240fb25da66f0 Mon Sep 17 00:00:00 2001 From: "benjamin%smedbergs.us" Date: Thu, 9 Nov 2006 15:12:24 +0000 Subject: [PATCH] Bug 345517, try #2, make the browser component use frozen linkage, so that ff+xr builds. This does *not* --enable-libxul by default for Firefox (yet). That will wait until after 1.9a1. Older patch r=darin+mento, revisions r=mano git-svn-id: svn://10.0.0.236/trunk@215031 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/intl/uconv/public/nsICharsetAlias.h | 2 +- mozilla/intl/uconv/public/nsIPlatformCharset.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/intl/uconv/public/nsICharsetAlias.h b/mozilla/intl/uconv/public/nsICharsetAlias.h index 35be2d0c165..4588baa08ac 100644 --- a/mozilla/intl/uconv/public/nsICharsetAlias.h +++ b/mozilla/intl/uconv/public/nsICharsetAlias.h @@ -39,7 +39,7 @@ #define nsICharsetAlias_h___ #include "nscore.h" -#include "nsString.h" +#include "nsStringGlue.h" #include "nsISupports.h" /* 0b4028d6-7473-4958-9b3c-4dee46bf68cb */ diff --git a/mozilla/intl/uconv/public/nsIPlatformCharset.h b/mozilla/intl/uconv/public/nsIPlatformCharset.h index 08091eef814..35d8b2379f4 100644 --- a/mozilla/intl/uconv/public/nsIPlatformCharset.h +++ b/mozilla/intl/uconv/public/nsIPlatformCharset.h @@ -38,7 +38,7 @@ #ifndef nsIPlatformCharset_h__ #define nsIPlatformCharset_h__ -#include "nsString.h" +#include "nsStringGlue.h" #include "nsISupports.h" // Interface ID for our nsIPlatformCharset interface