From 1cf8eeea133768499ab601ac81176906cde671dc Mon Sep 17 00:00:00 2001 From: synergydev Date: Mon, 28 Oct 2013 17:04:12 -0700 Subject: camera: do not use GNU old-style field designators Avoiding the use of GNU extensions improves portability Fixes the following: error: use of GNU old-style field designator extension Change-Id: Ic1bf7e44b3bf0c9b30c8c950b02ad71452a0bd8f --- camera/CameraHal_Module.cpp | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/camera/CameraHal_Module.cpp b/camera/CameraHal_Module.cpp index cb4e8047..b2120cf5 100644 --- a/camera/CameraHal_Module.cpp +++ b/camera/CameraHal_Module.cpp @@ -42,23 +42,23 @@ static int camera_get_number_of_cameras(void); static int camera_get_camera_info(int camera_id, struct camera_info *info); static struct hw_module_methods_t camera_module_methods = { - open: camera_device_open + .open = camera_device_open }; camera_module_t HAL_MODULE_INFO_SYM = { - common: { - tag: HARDWARE_MODULE_TAG, - version_major: 1, - version_minor: 0, - id: CAMERA_HARDWARE_MODULE_ID, - name: "TI OMAP CameraHal Module", - author: "TI", - methods: &camera_module_methods, - dso: NULL, /* remove compilation warnings */ - reserved: {0}, /* remove compilation warnings */ + .common = { + .tag = HARDWARE_MODULE_TAG, + .version_major = 1, + .version_minor = 0, + .id = CAMERA_HARDWARE_MODULE_ID, + .name = "TI OMAP CameraHal Module", + .author = "TI", + .methods = &camera_module_methods, + .dso = NULL, /* remove compilation warnings */ + .reserved = {0}, /* remove compilation warnings */ }, - get_number_of_cameras: camera_get_number_of_cameras, - get_camera_info: camera_get_camera_info, + .get_number_of_cameras = camera_get_number_of_cameras, + .get_camera_info = camera_get_camera_info, }; typedef struct ti_camera_device { @@ -693,8 +693,3 @@ int camera_get_camera_info(int camera_id, struct camera_info *info) end: return rv; } - - - - - -- cgit v1.2.3