mirror of
https://github.com/XProger/OpenLara.git
synced 2025-08-18 19:01:45 +02:00
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 <santa.cm@gmail.com>
This commit is contained in:
committed by
Carlos Santa
parent
95b1b3ce8d
commit
5c6b4bd8d2
@@ -44,6 +44,8 @@
|
|||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
typedef unsigned __int64 uint64_t;
|
typedef unsigned __int64 uint64_t;
|
||||||
typedef signed __int64 int64_t;
|
typedef signed __int64 int64_t;
|
||||||
|
#elif defined(__x86_64__) && defined(__linux__)
|
||||||
|
#include <sys/types.h>
|
||||||
#else
|
#else
|
||||||
typedef unsigned long long uint64_t;
|
typedef unsigned long long uint64_t;
|
||||||
typedef signed long long int64_t;
|
typedef signed long long int64_t;
|
||||||
|
Reference in New Issue
Block a user