summaryrefslogtreecommitdiffstats
path: root/gfx/thebes/gfxFontconfigFonts.cpp
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-03-30 19:10:17 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-03-30 19:10:17 +0100
commit25779d371c571e4f51792af3e3c5588b3186e934 (patch)
tree5399f1a5456fb395b3780bfce49b4b170bd634b8 /gfx/thebes/gfxFontconfigFonts.cpp
parent60d420b0ad6dc722b62b5c2948c865e2e61b8212 (diff)
downloadUXP-25779d371c571e4f51792af3e3c5588b3186e934.tar
UXP-25779d371c571e4f51792af3e3c5588b3186e934.tar.gz
UXP-25779d371c571e4f51792af3e3c5588b3186e934.tar.lz
UXP-25779d371c571e4f51792af3e3c5588b3186e934.tar.xz
UXP-25779d371c571e4f51792af3e3c5588b3186e934.zip
Issue #187: Remove solaris conditional code.
Diffstat (limited to 'gfx/thebes/gfxFontconfigFonts.cpp')
-rw-r--r--gfx/thebes/gfxFontconfigFonts.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/gfx/thebes/gfxFontconfigFonts.cpp b/gfx/thebes/gfxFontconfigFonts.cpp
index bbcbbabf9..9caecc4c0 100644
--- a/gfx/thebes/gfxFontconfigFonts.cpp
+++ b/gfx/thebes/gfxFontconfigFonts.cpp
@@ -1096,15 +1096,8 @@ gfxFcFontSet::SortPreferredFonts(bool &aWaitForUserFont)
FcFontSet *sets[1] = { fontSet };
FcResult result;
-#ifdef SOLARIS
- // Get around a crash of FcFontSetSort when FcConfig is nullptr
- // Solaris's FcFontSetSort needs an FcConfig (bug 474758)
- fontSet.own(FcFontSetSort(FcConfigGetCurrent(), sets, 1, mSortPattern,
- FcFalse, nullptr, &result));
-#else
fontSet.own(FcFontSetSort(nullptr, sets, 1, mSortPattern,
FcFalse, nullptr, &result));
-#endif
if (truncateMarker != nullptr && fontSet) {
nsAutoRef<FcFontSet> truncatedSet(FcFontSetCreate());