diff --git a/build/linux/aarch64/arm.linux.cross.cmake b/build/linux/aarch64/arm.linux.cross.cmake
index c320c78e..a6bd5327 100644
--- a/build/linux/aarch64/arm.linux.cross.cmake
+++ b/build/linux/aarch64/arm.linux.cross.cmake
@@ -9,4 +9,4 @@ SET(CMAKE_SYSTEM_PROCESSOR "armv8-a")
 
 add_definitions(-fPIC)
 add_definitions(-DARMLINUX)
-add_definitions(-D__gnu_linux__)
+add_definitions(-Dlinux)
diff --git a/build/linux/arm/arm.linux.cross.cmake b/build/linux/arm/arm.linux.cross.cmake
index a3fe416a..cc70f621 100644
--- a/build/linux/arm/arm.linux.cross.cmake
+++ b/build/linux/arm/arm.linux.cross.cmake
@@ -9,4 +9,4 @@ SET(CMAKE_SYSTEM_PROCESSOR "armv7-a")
 
 add_definitions(-fPIC)
 add_definitions(-DARMLINUX)
-add_definitions(-D__gnu_linux__)
+add_definitions(-Dlinux)
diff --git a/osal/linux/os_allocator.c b/osal/linux/os_allocator.c
index b7dbfeea..1bf41cb3 100644
--- a/osal/linux/os_allocator.c
+++ b/osal/linux/os_allocator.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#if defined(__gnu_linux__)
+#if defined(linux) && !defined(__ANDROID__)
 #include "mpp_log.h"
 #include "mpp_runtime.h"
 
diff --git a/osal/linux/os_env.c b/osal/linux/os_env.c
index a0cac63a..fd9283e9 100644
--- a/osal/linux/os_env.c
+++ b/osal/linux/os_env.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#if defined(__gnu_linux__)
+#if defined(linux) && !defined(__ANDROID__)
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/osal/linux/os_log.cpp b/osal/linux/os_log.cpp
index 35cf1e88..3688d54c 100644
--- a/osal/linux/os_log.cpp
+++ b/osal/linux/os_log.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#if defined(__gnu_linux__)
+#if defined(linux) && !defined(__ANDROID__)
 #include <stdio.h>
 #include <stdarg.h>
 #include <syslog.h>
diff --git a/osal/linux/os_mem.c b/osal/linux/os_mem.c
index 042531b6..f71aa976 100644
--- a/osal/linux/os_mem.c
+++ b/osal/linux/os_mem.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#if defined(__gnu_linux__)
+#if defined(linux) && !defined(__ANDROID__)
 #include <stdlib.h>
 #include "os_mem.h"
 
diff --git a/utils/utils.c b/utils/utils.c
index 0563c211..78406d0a 100644
--- a/utils/utils.c
+++ b/utils/utils.c
@@ -17,6 +17,7 @@
 #define MODULE_TAG "utils"
 
 #include <ctype.h>
+#include <limits.h>
 #include <string.h>
 
 #include "mpp_mem.h"
@@ -196,10 +197,10 @@ void wide_bit_sum(RK_U8 *data, RK_U32 len, RK_ULONG *sum)
     RK_U8   *data8 = NULL;
     RK_U32  loop;
     data8 = data;
-#if __WORDSIZE == 32
+#if LONG_MAX == INT_MAX
     RK_U16 *data_rk = NULL;
     data_rk = (RK_U16 *)data;
-#elif __WORDSIZE == 64
+#else
     RK_U32 *data_rk = NULL;
     data_rk = (RK_U32 *)data;
 #endif