!585 MEM_ALIGNMENT与lwip定义的宏冲突

Merge pull request !585 from SimonLi/master

frameworks/font/ui_font_allocator.h

@@ -20,7 +20,7 @@
 
 namespace OHOS {
 class UIFontAllocator {
-    static constexpr uint8_t MEM_ALIGNMENT = 4;
+    static constexpr uint8_t UI_FONT_MEM_ALIGNMENT = 4;
 
     struct Chunk {
         uint32_t next;
@@ -52,7 +52,7 @@ public:
 private:
     uint32_t AlignSize(uint32_t size)
     {
-        return (size + MEM_ALIGNMENT - 1U) & ~(MEM_ALIGNMENT - 1U);
+        return (size + UI_FONT_MEM_ALIGNMENT - 1U) & ~(UI_FONT_MEM_ALIGNMENT - 1U);
     }
     void CombineFree(Chunk* cache);
 
@@ -64,4 +64,4 @@ private:
     struct Chunk* free_;
 };
 } // namespace OHOS
-#endif /* UI_FONT_ALLOCATOR_H */
\ No newline at end of file
+#endif /* UI_FONT_ALLOCATOR_H */