Index: xfa/fgas/crt/fgas_utils.h |
diff --git a/xfa/fgas/crt/fgas_utils.h b/xfa/fgas/crt/fgas_utils.h |
index cb133b0c33f8736280355ad63105092b341b0a36..5ebb32ff370e2bd15eac9bc961b5d3174e524be0 100644 |
--- a/xfa/fgas/crt/fgas_utils.h |
+++ b/xfa/fgas/crt/fgas_utils.h |
@@ -84,7 +84,7 @@ class CFX_BaseArrayTemplate : public CFX_BaseArray { |
} |
}; |
typedef CFX_BaseArrayTemplate<void*> CFDE_PtrArray; |
-typedef CFX_BaseArrayTemplate<FX_DWORD> CFDE_DWordArray; |
+typedef CFX_BaseArrayTemplate<uint32_t> CFDE_DWordArray; |
typedef CFX_BaseArrayTemplate<uint16_t> CFDE_WordArray; |
template <class baseType> |
@@ -281,7 +281,7 @@ class CFX_MassArrayTemplate : public CFX_BaseMassArray { |
}; |
typedef CFX_MassArrayTemplate<void*> CFX_PtrMassArray; |
typedef CFX_MassArrayTemplate<int32_t> CFX_Int32MassArray; |
-typedef CFX_MassArrayTemplate<FX_DWORD> CFX_DWordMassArray; |
+typedef CFX_MassArrayTemplate<uint32_t> CFX_DWordMassArray; |
typedef CFX_MassArrayTemplate<uint16_t> CFX_WordMassArray; |
typedef CFX_MassArrayTemplate<CFX_Rect> CFX_RectMassArray; |
typedef CFX_MassArrayTemplate<CFX_RectF> CFX_RectFMassArray; |
@@ -396,7 +396,7 @@ class CFX_DiscreteArrayTemplate : public CFX_BaseDiscreteArray { |
void RemoveAll() { CFX_BaseDiscreteArray::RemoveAll(); } |
}; |
typedef CFX_DiscreteArrayTemplate<void*> CFX_PtrDiscreteArray; |
-typedef CFX_DiscreteArrayTemplate<FX_DWORD> CFX_DWordDiscreteArray; |
+typedef CFX_DiscreteArrayTemplate<uint32_t> CFX_DWordDiscreteArray; |
typedef CFX_DiscreteArrayTemplate<uint16_t> CFX_WordDiscreteArray; |
class CFX_BaseStack : public CFX_Target { |
@@ -435,7 +435,7 @@ class CFX_StackTemplate : public CFX_BaseStack { |
} |
}; |
typedef CFX_StackTemplate<void*> CFX_PtrStack; |
-typedef CFX_StackTemplate<FX_DWORD> CFX_DWordStack; |
+typedef CFX_StackTemplate<uint32_t> CFX_DWordStack; |
typedef CFX_StackTemplate<uint16_t> CFX_WordStack; |
typedef CFX_StackTemplate<int32_t> CFX_Int32Stack; |