3 files changed, 5 insertions, 1 deletions
diff --git a/xfa/fde/fde_gedevice.cpp b/xfa/fde/fde_gedevice.cpp
index c7c5cfb970..98f2492b79 100644
--- a/xfa/fde/fde_gedevice.cpp
+++ b/xfa/fde/fde_gedevice.cpp
@@ -145,7 +145,7 @@ FX_BOOL CFDE_RenderDevice::DrawString(CFDE_Brush* pBrush,
   for (int32_t i = 0; i < iCount; ++i) {
     pSTFont = pFont->GetSubstFont((int32_t)pCP->m_GlyphIndex);
     pCP->m_GlyphIndex &= 0x00FFFFFF;
-    pCP->m_bFontStyle = FALSE;
+    pCP->m_bFontStyle = false;
     if (pCurFont != pSTFont) {
       if (pCurFont) {
         pFxFont = pCurFont->GetDevFont();
diff --git a/xfa/fgas/layout/fgas_rtfbreak.cpp b/xfa/fgas/layout/fgas_rtfbreak.cpp
index 848f7f4e93..80591f1714 100644
--- a/xfa/fgas/layout/fgas_rtfbreak.cpp
+++ b/xfa/fgas/layout/fgas_rtfbreak.cpp
@@ -1285,7 +1285,9 @@ int32_t CFX_RTFBreak::GetDisplayPos(const FX_RTFTEXTOBJ* pText,
               pCharPos->m_GlyphIndex = pFont->GetGlyphIndex(wch, bMBCSCode);
             }
           }
+#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
           pCharPos->m_ExtGID = pCharPos->m_GlyphIndex;
+#endif
           pCharPos->m_FontCharWidth = iCharWidth;
           if (pWSForms) {
             *pWSForms += wForm;
diff --git a/xfa/fgas/layout/fgas_textbreak.cpp b/xfa/fgas/layout/fgas_textbreak.cpp
index 8eebbed76a..a272d0cfc7 100644
--- a/xfa/fgas/layout/fgas_textbreak.cpp
+++ b/xfa/fgas/layout/fgas_textbreak.cpp
@@ -1395,7 +1395,9 @@ int32_t CFX_TxtBreak::GetDisplayPos(const FX_TXTRUN* pTxtRun,
       if (!bEmptyChar || (bEmptyChar && !bSkipSpace)) {
         pCharPos->m_GlyphIndex =
             bCharCode ? wch : pFont->GetGlyphIndex(wForm, FALSE);
+#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
         pCharPos->m_ExtGID = pCharPos->m_GlyphIndex;
+#endif
         pCharPos->m_FontCharWidth = iCharWidth;
         if (pWSForms) {
           *pWSForms += wForm;