From 5c6b4bd8d2e399b010342a367c59fbc4dec73723 Mon Sep 17 00:00:00 2001 From: Carlos Santa Date: Sun, 14 May 2017 18:58:10 -0700 Subject: [PATCH] android: minimp3: Avoid redefinition of datatypes Under Linux OS there's no need to redefine int64_t as a data type still including sys/types.h to take care of any missing data types. The following compilation errors are thrown if int64_t is defined: Error:(50, 36) error: typedef redefinition with different types ('unsigned long long' vs '__uint64_t' (aka 'unsigned long')) Error:(51, 37) error: typedef redefinition with different types ('long long' vs '__int64_t' (aka 'long')) Issue: https://github.com/XProger/OpenLara/issues/67 Signed-off-by: Carlos Santa --- src/libs/minimp3/libc.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libs/minimp3/libc.h b/src/libs/minimp3/libc.h index d1e2ac2..0e021e0 100644 --- a/src/libs/minimp3/libc.h +++ b/src/libs/minimp3/libc.h @@ -44,6 +44,8 @@ #ifdef _MSC_VER typedef unsigned __int64 uint64_t; typedef signed __int64 int64_t; + #elif defined(__x86_64__) && defined(__linux__) + #include #else typedef unsigned long long uint64_t; typedef signed long long int64_t;