diff options
| author | Deckard Autoverifier <deckard@android.com> | 2011-07-18 15:46:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-18 15:46:14 -0700 |
| commit | bb29abfe798e0a3329380481834e5839db141902 (patch) | |
| tree | 0907a6c277de382747bb7e4aacf8f8bd7ce4dd84 /media/libstagefright/codecs/common | |
| parent | 630e65cc858d7592446c5f9174e713e29d58588b (diff) | |
| parent | c57d9ff30a5bff931f8ffa8d3fa390628268a8a8 (diff) | |
| download | frameworks_av-bb29abfe798e0a3329380481834e5839db141902.zip frameworks_av-bb29abfe798e0a3329380481834e5839db141902.tar.gz frameworks_av-bb29abfe798e0a3329380481834e5839db141902.tar.bz2 | |
am b7f0d825: am 691257b1: am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
* commit 'b7f0d825c56dced10bb7df7cfc624ef9ebffe21c':
stagefright: Only use __int64 on MSVC, not on all win32 compilers
Diffstat (limited to 'media/libstagefright/codecs/common')
| -rw-r--r-- | media/libstagefright/codecs/common/include/voType.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ typedef signed long VO_S32; 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 */ |