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/InstAlloc.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/InstAlloc.h')
| -rw-r--r-- | media/libeffects/lvm/lib/Common/lib/InstAlloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libeffects/lvm/lib/Common/lib/InstAlloc.h b/media/libeffects/lvm/lib/Common/lib/InstAlloc.h index c6954f2..7f725f4 100644 --- a/media/libeffects/lvm/lib/Common/lib/InstAlloc.h +++ b/media/libeffects/lvm/lib/Common/lib/InstAlloc.h @@ -29,7 +29,7 @@ extern "C" { typedef struct { LVM_UINT32 TotalSize; /* Accumulative total memory size */ - LVM_UINT32 pNextMember; /* Pointer to the next instance member to be allocated */ + uintptr_t pNextMember; /* Pointer to the next instance member to be allocated */ } INST_ALLOC; |