diff options
| author | Glenn Kasten <gkasten@android.com> | 2014-04-03 17:22:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-03 17:22:56 +0000 |
| commit | 18b94aa8486703909942935d902e632463b6e8a9 (patch) | |
| tree | 6029b9dbe9e6a89fbd6750ccba8f786e98d302ac /include/media | |
| parent | 7f4fe6e58638bb60080ad860bc461ff95514a677 (diff) | |
| parent | fb3bbd1df323c24dc10c095f29ee8010fc3d1df0 (diff) | |
| download | frameworks_native-18b94aa8486703909942935d902e632463b6e8a9.zip frameworks_native-18b94aa8486703909942935d902e632463b6e8a9.tar.gz frameworks_native-18b94aa8486703909942935d902e632463b6e8a9.tar.bz2 | |
am fb3bbd1d: am d2f76332: Merge "AArch64: Correction to OMX_U32 and OMX_S32"
* commit 'fb3bbd1df323c24dc10c095f29ee8010fc3d1df0':
AArch64: Correction to OMX_U32 and OMX_S32
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/openmax/OMX_Types.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/media/openmax/OMX_Types.h b/include/media/openmax/OMX_Types.h index 03fd4bc..9dec372 100644 --- a/include/media/openmax/OMX_Types.h +++ b/include/media/openmax/OMX_Types.h @@ -48,6 +48,8 @@ #ifndef OMX_Types_h #define OMX_Types_h +#include <stdint.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -160,10 +162,10 @@ typedef unsigned short OMX_U16; typedef signed short OMX_S16; /** OMX_U32 is a 32 bit unsigned quantity that is 32 bit word aligned */ -typedef unsigned long OMX_U32; +typedef uint32_t OMX_U32; /** OMX_S32 is a 32 bit signed quantity that is 32 bit word aligned */ -typedef signed long OMX_S32; +typedef int32_t OMX_S32; /* Users with compilers that cannot accept the "long long" designation should |