diff options
| author | Glenn Kasten <gkasten@android.com> | 2014-04-03 17:00:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-03 17:00:59 +0000 |
| commit | d2f7633277dd13ac269adb51c4e7a85746e6c599 (patch) | |
| tree | ceb556f99075d833ef703f47e0971909c17677e2 | |
| parent | 033bdd72f9f32f4bd3d282750bdc0dcfbb469959 (diff) | |
| parent | 849de60c1eae2ec28f0b468b9ec16b339aad17e9 (diff) | |
| download | native-d2f7633277dd13ac269adb51c4e7a85746e6c599.tar.gz | |
Merge "AArch64: Correction to OMX_U32 and OMX_S32"
| -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 03fd4bcf50..9dec372c9d 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 |