diff options
| author | Greg Hackmann <ghackmann@google.com> | 2014-03-07 19:33:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 19:33:05 +0000 |
| commit | cc03474bc0927d5b9ee3fb518861b2d885253933 (patch) | |
| tree | 02cdac0332e0262a5857d264adbfd9693e53d2c8 | |
| parent | cea3c679b13fda5984273ae522b5b423fb8dc987 (diff) | |
| parent | f4c46752df57be558773a056d6545877ef65c844 (diff) | |
| download | hardware_libhardware-cc03474bc0927d5b9ee3fb518861b2d885253933.zip hardware_libhardware-cc03474bc0927d5b9ee3fb518861b2d885253933.tar.gz hardware_libhardware-cc03474bc0927d5b9ee3fb518861b2d885253933.tar.bz2 | |
am f4c46752: Merge "AArch64: Calculate private_handle_t\'s numInts"
* commit 'f4c46752df57be558773a056d6545877ef65c844':
AArch64: Calculate private_handle_t's numInts
| -rw-r--r-- | modules/gralloc/gralloc_priv.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/gralloc/gralloc_priv.h b/modules/gralloc/gralloc_priv.h index 9f32d58..22a5715 100644 --- a/modules/gralloc/gralloc_priv.h +++ b/modules/gralloc/gralloc_priv.h @@ -79,7 +79,9 @@ struct private_handle_t { int pid; #ifdef __cplusplus - static const int sNumInts = 6; + static inline int sNumInts() { + return (((sizeof(private_handle_t) - sizeof(native_handle_t))/sizeof(int)) - sNumFds); + } static const int sNumFds = 1; static const int sMagic = 0x3141592; @@ -88,7 +90,7 @@ struct private_handle_t { base(0), pid(getpid()) { version = sizeof(native_handle); - numInts = sNumInts; + numInts = sNumInts(); numFds = sNumFds; } ~private_handle_t() { @@ -98,7 +100,7 @@ struct private_handle_t { static int validate(const native_handle* h) { const private_handle_t* hnd = (const private_handle_t*)h; if (!h || h->version != sizeof(native_handle) || - h->numInts != sNumInts || h->numFds != sNumFds || + h->numInts != sNumInts() || h->numFds != sNumFds || hnd->magic != sMagic) { ALOGE("invalid gralloc handle (at %p)", h); |