| commit | d2854e2ac7e7e3cbe4b3c67a2d7823a6153c2488 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 08 12:07:03 2012 -0700 |
| committer | android code review <noreply-gerritcodereview@google.com> | Wed Aug 08 12:07:04 2012 -0700 |
| tree | 28b49a23109223b38aeaba80fd92832ea255a131 | |
| parent | 2228e360595641dd906bf1773307f43d304f5b2e [diff] | |
| parent | 52396724f8285d099dcdba131b751ffe5417a283 [diff] |
Merge "Only use __int64 on MSVC, not on all win32 compilers"
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 @@ /* Define 64 bit base integer type. */ -#ifdef _WIN32 +#ifdef _MSC_VER typedef __int64 INT64; typedef unsigned __int64 UINT64; #else