am fb3bbd1d: am d2f76332: Merge "AArch64: Correction to OMX_U32 and OMX_S32"

* commit 'fb3bbd1df323c24dc10c095f29ee8010fc3d1df0':
  AArch64: Correction to OMX_U32 and OMX_S32
This commit is contained in:
Glenn Kasten 2014-04-03 17:22:56 +00:00 committed by Android Git Automerger
commit 18b94aa848

View File

@ -48,6 +48,8 @@
#ifndef OMX_Types_h #ifndef OMX_Types_h
#define OMX_Types_h #define OMX_Types_h
#include <stdint.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
@ -160,10 +162,10 @@ typedef unsigned short OMX_U16;
typedef signed short OMX_S16; typedef signed short OMX_S16;
/** OMX_U32 is a 32 bit unsigned quantity that is 32 bit word aligned */ /** 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 */ /** 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 /* Users with compilers that cannot accept the "long long" designation should