summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-08 12:07:03 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-08-08 12:07:04 -0700
commitd2854e2ac7e7e3cbe4b3c67a2d7823a6153c2488 (patch)
tree28b49a23109223b38aeaba80fd92832ea255a131
parent2228e360595641dd906bf1773307f43d304f5b2e (diff)
parent52396724f8285d099dcdba131b751ffe5417a283 (diff)
downloadODR-AudioEnc-d2854e2ac7e7e3cbe4b3c67a2d7823a6153c2488.tar.gz
ODR-AudioEnc-d2854e2ac7e7e3cbe4b3c67a2d7823a6153c2488.tar.bz2
ODR-AudioEnc-d2854e2ac7e7e3cbe4b3c67a2d7823a6153c2488.zip
Merge "Only use __int64 on MSVC, not on all win32 compilers"
-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