commit af7e9726a19d106494e96078dedfda7baaeb59cd
author Deckard Autoverifier <deckard@android.com> Mon Jul 18 15:38:22 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 18 15:38:22 2011 -0700
tree 45d20cf52a575b74695d3801a43e03b59efbc486
parent 3259fc9acfc740a30b3a52bf70fe6e402d2d1010
parent aacb82162005eec4c06cba90389eded2c189a448

am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"

* commit '55f115a3214343c826acf27fcbc4bf2927049083':
  stagefright: Only use __int64 on MSVC, not on all win32 compilers

media/libstagefright/codecs/common/include/voType.h

diff --git a/media/libstagefright/codecs/common/include/voType.h b/media/libstagefright/codecs/common/include/voType.h
index 70b2e83..5f659ab 100644
--- a/media/libstagefright/codecs/common/include/voType.h
+++ b/media/libstagefright/codecs/common/include/voType.h
@@ -101,7 +101,7 @@
    since the compiler does not support the way the component was written.
 */
 #ifndef VO_SKIP64BIT
-#ifdef _WIN32
+#ifdef _MSC_VER
 /** VO_U64 is a 64 bit unsigned quantity that is 64 bit word aligned */
 typedef unsigned __int64  VO_U64;
 /** VO_S64 is a 64 bit signed quantity that is 64 bit word aligned */