summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2012-07-06 17:14:12 +0300
committerMartin Storsjo <martin@martin.st>2012-11-01 11:30:40 +0200
commitdc0de33e863cb55f500f9cbf113371d1ec0f601a (patch)
tree09c08a2d12ee4954d39af3acfb3d3a21d51d3743
parent961d5598d3d514916eebc0ac89c9459b4a02ee51 (diff)
downloadfdk-aac-dc0de33e863cb55f500f9cbf113371d1ec0f601a.tar.gz
fdk-aac-dc0de33e863cb55f500f9cbf113371d1ec0f601a.tar.bz2
fdk-aac-dc0de33e863cb55f500f9cbf113371d1ec0f601a.zip
Only use __int64 on MSVC, not on all win32 compilers
Mingw32 doesn't define the __int64 types. This was implicitly reverted in AOSP (where this change was already merged before) by the new code drop from Fraunhofer.
-rw-r--r--libSYS/include/machine_type.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libSYS/include/machine_type.h b/libSYS/include/machine_type.h
index b5642b2..d04a8e8 100644
--- a/libSYS/include/machine_type.h
+++ b/libSYS/include/machine_type.h
@@ -173,7 +173,7 @@ amm-info@iis.fraunhofer.de
/* Define 64 bit base integer type. */
-#ifdef _WIN32
+#ifdef _MSC_VER
typedef __int64 INT64;
typedef unsigned __int64 UINT64;
#else