diff options
| author | Adam Weinberger <adamw@FreeBSD.org> | 2004-07-25 07:21:34 +0000 |
|---|---|---|
| committer | Adam Weinberger <adamw@FreeBSD.org> | 2004-07-25 07:21:34 +0000 |
| commit | 8d88c56a7ce73be8d930d570b56530c6ecabbfd9 (patch) | |
| tree | 3cddca54e15ea0a46e509554368f77177544ce2f /www/seamonkey2/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp | |
| parent | Update to 0.1.6 (diff) | |
Fix build on 4.x.
Notes
Notes:
svn path=/head/; revision=114608
Diffstat (limited to '')
| -rw-r--r-- | www/seamonkey2/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/www/seamonkey2/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp b/www/seamonkey2/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp index be76e019d074..a1c0265f14b6 100644 --- a/www/seamonkey2/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp +++ b/www/seamonkey2/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp @@ -1,10 +1,9 @@ ---- layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp.orig Thu Feb 26 02:13:35 2004 -+++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp Thu Feb 26 03:27:56 2004 -@@ -56,6 +57,13 @@ +--- layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp.orig Sat Jul 24 23:59:16 2004 ++++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp Sun Jul 25 00:04:20 2004 +@@ -56,6 +56,12 @@ #include "nsArray.h" #include "nsDataHashtable.h" -+ +#ifdef HAVE_CPP_2BYTE_WCHAR_T + typedef nsDependentString nsLiteralString; +#else @@ -14,30 +13,30 @@ /** * \addtogroup libart_renderer Libart Rendering Engine * @{ -@@ -112,7 +120,7 @@ +@@ -112,7 +118,7 @@ nsCOMPtr<nsISVGGlyphMetricsSource> mSource; public: -- static nsDataHashtable<nsStringHashKey,nsDependentString*> sFontAliases; -+ static nsDataHashtable<nsStringHashKey,nsLiteralString*> sFontAliases; +- static nsDataHashtable<nsStringHashKey,const nsDependentString*> sFontAliases; ++ static nsDataHashtable<nsStringHashKey,const nsLiteralString*> sFontAliases; }; /** @} */ -@@ -120,7 +128,7 @@ +@@ -120,7 +126,7 @@ //---------------------------------------------------------------------- // nsSVGLibartGlyphMetricsFT implementation: --nsDataHashtable<nsStringHashKey,nsDependentString*> -+nsDataHashtable<nsStringHashKey,nsLiteralString*> +-nsDataHashtable<nsStringHashKey,const nsDependentString*> ++nsDataHashtable<nsStringHashKey,const nsLiteralString*> nsSVGLibartGlyphMetricsFT::sFontAliases; -@@ -406,7 +414,7 @@ +@@ -406,7 +412,7 @@ } else { // try alias if there is one: -- nsDependentString *alias = nsnull; -+ nsLiteralString *alias = nsnull; +- const nsDependentString *alias = nsnull; ++ const nsLiteralString *alias = nsnull; nsSVGLibartGlyphMetricsFT::sFontAliases.Get(NS_ConvertUTF8toUCS2(family_name), &alias); if (alias) { |