diff options
author | Narayan Kamath <narayan@google.com> | 2014-03-07 20:15:52 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 20:15:52 +0000 |
commit | 08d6608556b44f90f6e7fb7dc280f4509af79502 (patch) | |
tree | b19240f44ee71e6dec43fb7806e1d59020c400b0 /media/libeffects/lvm/lib/Common/lib/LVM_Types.h | |
parent | ad77a5e08282a92903f91c414b8f65797cb72dde (diff) | |
parent | 3a46b975070b503bc71b53b70f9a8f5bd03bba1c (diff) | |
download | frameworks_av-08d6608556b44f90f6e7fb7dc280f4509af79502.zip frameworks_av-08d6608556b44f90f6e7fb7dc280f4509af79502.tar.gz frameworks_av-08d6608556b44f90f6e7fb7dc280f4509af79502.tar.bz2 |
am 3a46b975: am a9b82160: Merge "LP64 fixes for media/libeffects"
* commit '3a46b975070b503bc71b53b70f9a8f5bd03bba1c':
LP64 fixes for media/libeffects
Diffstat (limited to 'media/libeffects/lvm/lib/Common/lib/LVM_Types.h')
-rw-r--r-- | media/libeffects/lvm/lib/Common/lib/LVM_Types.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/media/libeffects/lvm/lib/Common/lib/LVM_Types.h b/media/libeffects/lvm/lib/Common/lib/LVM_Types.h index 81655dd..0c6fb25 100644 --- a/media/libeffects/lvm/lib/Common/lib/LVM_Types.h +++ b/media/libeffects/lvm/lib/Common/lib/LVM_Types.h @@ -29,6 +29,7 @@ extern "C" { #endif /* __cplusplus */ +#include <stdint.h> /****************************************************************************************/ /* */ @@ -85,14 +86,14 @@ extern "C" { typedef char LVM_CHAR; /* ASCII character */ -typedef char LVM_INT8; /* Signed 8-bit word */ -typedef unsigned char LVM_UINT8; /* Unsigned 8-bit word */ +typedef int8_t LVM_INT8; /* Signed 8-bit word */ +typedef uint8_t LVM_UINT8; /* Unsigned 8-bit word */ -typedef short LVM_INT16; /* Signed 16-bit word */ -typedef unsigned short LVM_UINT16; /* Unsigned 16-bit word */ +typedef int16_t LVM_INT16; /* Signed 16-bit word */ +typedef uint16_t LVM_UINT16; /* Unsigned 16-bit word */ -typedef long LVM_INT32; /* Signed 32-bit word */ -typedef unsigned long LVM_UINT32; /* Unsigned 32-bit word */ +typedef int32_t LVM_INT32; /* Signed 32-bit word */ +typedef uint32_t LVM_UINT32; /* Unsigned 32-bit word */ /****************************************************************************************/ |