Use standard initializers
The code currently uses GNU initializers as opposed to C99 initializers. Clang emits a warning about this, causing the -Werror build to fail. Either variant works fine in gcc. BUG: 18017604 Change-Id: I196b809e085637e097706557ce62462dba8b2c3d Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
This commit is contained in:
parent
c2ec890152
commit
ce2c4b3174
|
@ -61,36 +61,36 @@ extern int gralloc_perform(struct gralloc_module_t const* module,
|
|||
|
||||
// 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
|
||||
|
|
|
@ -45,20 +45,20 @@ static int hwc_device_open(const struct hw_module_t* module,
|
|||
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},
|
||||
}
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue