diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-03-30 19:10:17 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-03-30 19:10:17 +0100 |
| commit | e0fe19433aeb11e78009b178ab33d6197d7fad39 (patch) | |
| tree | 5399f1a5456fb395b3780bfce49b4b170bd634b8 /gfx | |
| parent | ee91847c038fad5d155528a09e5c61e4eaf635f4 (diff) | |
| download | uxp-e0fe19433aeb11e78009b178ab33d6197d7fad39.tar.gz | |
Issue mcp-graveyard/UXP#187: Remove solaris conditional code.
Diffstat (limited to 'gfx')
| -rw-r--r-- | gfx/thebes/gfxFontconfigFonts.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/gfx/thebes/gfxFontconfigFonts.cpp b/gfx/thebes/gfxFontconfigFonts.cpp index bbcbbabf91..9caecc4c07 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()); |