diff options
| author | Deckard Autoverifier <deckard@android.com> | 2011-07-18 15:43:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-18 15:43:54 -0700 |
| commit | b7f0d825c56dced10bb7df7cfc624ef9ebffe21c (patch) | |
| tree | 201219fd222187046143cbd8592496772fc6efbe | |
| parent | f139965e4acc8eadb57f1d18d34ea3a89ab622d0 (diff) | |
| parent | 691257b1812ffd8172b01c17b9ba23a48eb76594 (diff) | |
| download | frameworks_base-b7f0d825c56dced10bb7df7cfc624ef9ebffe21c.zip frameworks_base-b7f0d825c56dced10bb7df7cfc624ef9ebffe21c.tar.gz frameworks_base-b7f0d825c56dced10bb7df7cfc624ef9ebffe21c.tar.bz2 | |
am 691257b1: am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
* commit '691257b1812ffd8172b01c17b9ba23a48eb76594':
stagefright: Only use __int64 on MSVC, not on all win32 compilers
| -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 */ |