diff options
| author | Nick Kralevich <nnk@google.com> | 2013-11-07 03:34:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-11-07 03:34:27 +0000 |
| commit | af822c43cf144a991db49d8c25068d054265ae37 (patch) | |
| tree | 2d5e798ab5e84a53f52999f06bea0e9a013a00ce | |
| parent | 1d640f05dcedfcaae63eeb90f3d89b16e95d0208 (diff) | |
| parent | 6abbed50934dab5d73cd9e06086e37ac8d87ef18 (diff) | |
| download | libhardware-af822c43cf144a991db49d8c25068d054265ae37.tar.gz | |
Merge "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 99aeb012..03d46d59 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, }; /*****************************************************************************/ |