diff options
author | Nick Kralevich <nnk@google.com> | 2013-11-06 19:40:57 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-06 19:40:57 -0800 |
commit | 15f0d47dc6611150be34bc98a8f328df53c93397 (patch) | |
tree | 975d8fab3742947569791f8a7e51ea1e72154a20 | |
parent | fc2a7951518b4d39ea88b599ba37cc9ec57418dd (diff) | |
parent | af822c43cf144a991db49d8c25068d054265ae37 (diff) | |
download | libhardware-15f0d47dc6611150be34bc98a8f328df53c93397.tar.gz |
am af822c43: Merge "gralloc: do not use GNU old-style field designators"
* commit 'af822c43cf144a991db49d8c25068d054265ae37':
gralloc: do not use GNU old-style field designators
-rw-r--r-- | modules/gralloc/gralloc.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/modules/gralloc/gralloc.cpp b/modules/gralloc/gralloc.cpp index a2dec6b7..f832f35c 100644 --- a/modules/gralloc/gralloc.cpp +++ b/modules/gralloc/gralloc.cpp @@ -72,31 +72,31 @@ extern int gralloc_unregister_buffer(gralloc_module_t const* module, /*****************************************************************************/ static struct hw_module_methods_t gralloc_module_methods = { - open: gralloc_device_open + .open = gralloc_device_open }; struct private_module_t HAL_MODULE_INFO_SYM = { - base: { - common: { - tag: HARDWARE_MODULE_TAG, - version_major: 1, - version_minor: 0, - id: GRALLOC_HARDWARE_MODULE_ID, - name: "Graphics Memory Allocator Module", - author: "The Android Open Source Project", - methods: &gralloc_module_methods + .base = { + .common = { + .tag = HARDWARE_MODULE_TAG, + .version_major = 1, + .version_minor = 0, + .id = GRALLOC_HARDWARE_MODULE_ID, + .name = "Graphics Memory Allocator Module", + .author = "The Android Open Source Project", + .methods = &gralloc_module_methods }, - registerBuffer: gralloc_register_buffer, - unregisterBuffer: gralloc_unregister_buffer, - lock: gralloc_lock, - unlock: gralloc_unlock, + .registerBuffer = gralloc_register_buffer, + .unregisterBuffer = gralloc_unregister_buffer, + .lock = gralloc_lock, + .unlock = gralloc_unlock, }, - framebuffer: 0, - flags: 0, - numBuffers: 0, - bufferMask: 0, - lock: PTHREAD_MUTEX_INITIALIZER, - currentBuffer: 0, + .framebuffer = 0, + .flags = 0, + .numBuffers = 0, + .bufferMask = 0, + .lock = PTHREAD_MUTEX_INITIALIZER, + .currentBuffer = 0, }; /*****************************************************************************/ |