Merge pull request #492 from justdan96/apple-filesystem-no-ifdef

Remove #ifdef apple in order to use std::filesystem
justdan96 · Dec 4, 2021 · 27b6dfd · 27b6dfd
2 parents 88316ec + 9327639
commit 27b6dfd
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/tsMuxer/osdep/textSubtitlesRenderFT.cpp b/tsMuxer/osdep/textSubtitlesRenderFT.cpp
@@ -104,12 +104,9 @@ void TextSubtitlesRenderFT::loadFontMap()
             std::map<std::string, std::string>::iterator itr = m_fontNameToFile.find(fontFamily);
 
             if (itr == m_fontNameToFile.end() || fileList[i].length() < itr->second.length())
-#if defined(__APPLE__) && defined(__MACH__)
-                m_fontNameToFile[fontFamily] = std::__fs::filesystem::canonical(fileList[i]).string();
-#else
+            {
                 m_fontNameToFile[fontFamily] = std::filesystem::canonical(fileList[i]).string();
-#endif
-
+            }
             FT_Done_Face(font);
         }
         // LTRACE(LT_INFO, 2, "after loading font " << fileList[i].c_str());