diff options
| author | Deckard Autoverifier <deckard@android.com> | 2011-07-18 15:23:09 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-07-18 15:23:09 -0700 |
| commit | aacb82162005eec4c06cba90389eded2c189a448 (patch) | |
| tree | 675862db7b1b9e1ae2ce3718b82ccc189ab081a8 /media/libstagefright/codecs | |
| parent | ac04df0bbb3a1b9627cbc0eb298a596c665a3e7c (diff) | |
| parent | 2a4592119fe1d303fff2f268fffe7a84f38f8027 (diff) | |
| download | frameworks_av-aacb82162005eec4c06cba90389eded2c189a448.zip frameworks_av-aacb82162005eec4c06cba90389eded2c189a448.tar.gz frameworks_av-aacb82162005eec4c06cba90389eded2c189a448.tar.bz2 | |
Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
Diffstat (limited to 'media/libstagefright/codecs')
| -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 */ |