3 files changed, 5 insertions, 10 deletions
diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h
index df36c26a02..3ae8b10510 100644
--- a/core/include/fxcrt/fx_basic.h
+++ b/core/include/fxcrt/fx_basic.h
@@ -744,7 +744,7 @@ public:
         if (data_size > FixedSize) {
             m_pData = FX_Alloc(DataType, data_size);
         } else {
-            FXSYS_memset32(m_Data, 0, sizeof(DataType)*FixedSize);
+            FXSYS_memset(m_Data, 0, sizeof(DataType)*FixedSize);
         }
     }
     void SetDataSize(int data_size)
@@ -756,7 +756,7 @@ public:
         if (data_size > FixedSize) {
             m_pData = FX_Alloc(DataType, data_size);
         } else {
-            FXSYS_memset32(m_Data, 0, sizeof(DataType)*FixedSize);
+            FXSYS_memset(m_Data, 0, sizeof(DataType)*FixedSize);
         }
     }
     ~CFX_FixedBufGrow()
diff --git a/core/include/fxcrt/fx_string.h b/core/include/fxcrt/fx_string.h
index f02cce994b..8d73555814 100644
--- a/core/include/fxcrt/fx_string.h
+++ b/core/include/fxcrt/fx_string.h
@@ -88,11 +88,11 @@ public:
 
     bool operator== (const char* ptr) const {
         return FXSYS_strlen(ptr) == m_Length &&
-                FXSYS_memcmp32(ptr, m_Ptr, m_Length) == 0;
+                FXSYS_memcmp(ptr, m_Ptr, m_Length) == 0;
     }
     bool operator== (const CFX_ByteStringC& other) const {
         return other.m_Length == m_Length &&
-                FXSYS_memcmp32(other.m_Ptr, m_Ptr, m_Length) == 0;
+                FXSYS_memcmp(other.m_Ptr, m_Ptr, m_Length) == 0;
     }
     bool operator!= (const char* ptr) const { return !(*this == ptr); }
     bool operator!= (const CFX_ByteStringC& other) const {
@@ -254,7 +254,7 @@ public:
 
     bool operator< (const CFX_ByteString& str) const
     {
-        int result = FXSYS_memcmp32(c_str(), str.c_str(), std::min(GetLength(), str.GetLength()));
+        int result = FXSYS_memcmp(c_str(), str.c_str(), std::min(GetLength(), str.GetLength()));
         return result < 0 || (result == 0 && GetLength() < str.GetLength());
     }
 
diff --git a/core/include/fxcrt/fx_system.h b/core/include/fxcrt/fx_system.h
index ec6d6294b0..8bc2b4ab2a 100644
--- a/core/include/fxcrt/fx_system.h
+++ b/core/include/fxcrt/fx_system.h
@@ -214,11 +214,6 @@ wchar_t*	FXSYS_wcslwr(wchar_t* str);
 wchar_t*	FXSYS_wcsupr(wchar_t* str);
 #endif  // _FXM_PLATFORM == _FXM_PLATFORM_WINDOWS_
 
-#define FXSYS_memcpy32		FXSYS_memcpy
-#define FXSYS_memcmp32		FXSYS_memcmp
-#define FXSYS_memset32		FXSYS_memset
-#define FXSYS_memset8		FXSYS_memset
-#define FXSYS_memmove32		FXSYS_memmove
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 #define FXSYS_pow(a, b)		(FX_FLOAT)powf(a, b)
 #else