Merge "Use standard initializers"
diff --git a/msm8960/libgralloc/gralloc.cpp b/msm8960/libgralloc/gralloc.cpp
index 038c7e0..8a5cddb 100644
--- a/msm8960/libgralloc/gralloc.cpp
+++ b/msm8960/libgralloc/gralloc.cpp
@@ -61,36 +61,36 @@
// HAL module methods
static struct hw_module_methods_t gralloc_module_methods = {
- open: gralloc_device_open
+ .open = gralloc_device_open
};
// HAL module initialize
struct private_module_t HAL_MODULE_INFO_SYM = {
- base: {
- common: {
- tag: HARDWARE_MODULE_TAG,
- module_api_version: GRALLOC_MODULE_API_VERSION_0_2,
- hal_api_version: 0,
- id: GRALLOC_HARDWARE_MODULE_ID,
- name: "Graphics Memory Allocator Module",
- author: "The Android Open Source Project",
- methods: &gralloc_module_methods,
- dso: 0,
+ .base = {
+ .common = {
+ .tag = HARDWARE_MODULE_TAG,
+ .module_api_version = GRALLOC_MODULE_API_VERSION_0_2,
+ .hal_api_version = 0,
+ .id = GRALLOC_HARDWARE_MODULE_ID,
+ .name = "Graphics Memory Allocator Module",
+ .author = "The Android Open Source Project",
+ .methods = &gralloc_module_methods,
+ .dso = 0,
},
- registerBuffer: gralloc_register_buffer,
- unregisterBuffer: gralloc_unregister_buffer,
- lock: gralloc_lock,
- unlock: gralloc_unlock,
- perform: gralloc_perform,
- lock_ycbcr: gralloc_lock_ycbcr,
+ .registerBuffer = gralloc_register_buffer,
+ .unregisterBuffer = gralloc_unregister_buffer,
+ .lock = gralloc_lock,
+ .unlock = gralloc_unlock,
+ .perform = gralloc_perform,
+ .lock_ycbcr = gralloc_lock_ycbcr,
},
- framebuffer: 0,
- fbFormat: 0,
- flags: 0,
- numBuffers: 0,
- bufferMask: 0,
- lock: PTHREAD_MUTEX_INITIALIZER,
- currentBuffer: 0,
+ .framebuffer = 0,
+ .fbFormat = 0,
+ .flags = 0,
+ .numBuffers = 0,
+ .bufferMask = 0,
+ .lock = PTHREAD_MUTEX_INITIALIZER,
+ .currentBuffer = 0,
};
// Open Gralloc device
diff --git a/msm8960/libhwcomposer/hwc.cpp b/msm8960/libhwcomposer/hwc.cpp
index 3ee320c..8bf4c28 100644
--- a/msm8960/libhwcomposer/hwc.cpp
+++ b/msm8960/libhwcomposer/hwc.cpp
@@ -45,20 +45,20 @@
struct hw_device_t** device);
static struct hw_module_methods_t hwc_module_methods = {
- open: hwc_device_open
+ .open = hwc_device_open
};
hwc_module_t HAL_MODULE_INFO_SYM = {
- common: {
- tag: HARDWARE_MODULE_TAG,
- version_major: 2,
- version_minor: 0,
- id: HWC_HARDWARE_MODULE_ID,
- name: "Qualcomm Hardware Composer Module",
- author: "CodeAurora Forum",
- methods: &hwc_module_methods,
- dso: 0,
- reserved: {0},
+ .common = {
+ .tag = HARDWARE_MODULE_TAG,
+ .version_major = 2,
+ .version_minor = 0,
+ .id = HWC_HARDWARE_MODULE_ID,
+ .name = "Qualcomm Hardware Composer Module",
+ .author = "CodeAurora Forum",
+ .methods = &hwc_module_methods,
+ .dso = 0,
+ .reserved = {0},
}
};