Avoid GNU old-style field designator extension

diff --git a/CameraFactory.cpp b/CameraFactory.cpp
index 00be34e..26f0ddb 100644 (file)
--- a/CameraFactory.cpp
+++ b/CameraFactory.cpp
@@ -223,7 +223,7 @@ int CameraFactory::get_camera_info(int camera_id,
 
 /* Entry point for camera HAL API. */
 struct hw_module_methods_t CameraFactory::mCameraModuleMethods = {
-    open: CameraFactory::device_open
+    .open = CameraFactory::device_open
 };
 
 }; /* namespace android */

diff --git a/CameraHal.cpp b/CameraHal.cpp
index 13e8f36..8a6f77b 100644 (file)
--- a/CameraHal.cpp
+++ b/CameraHal.cpp
@@ -29,17 +29,17 @@
  * Required HAL header.
  */
 camera_module_t HAL_MODULE_INFO_SYM = {
-    common: {
-         tag:           HARDWARE_MODULE_TAG,
-         version_major: 1,
-         version_minor: 0,
-         id:            CAMERA_HARDWARE_MODULE_ID,
-         name:          "Camera Module",
-         author:        "The Android Open Source Project",
-         methods:       &android::CameraFactory::mCameraModuleMethods,
-         dso:           NULL,
-         reserved:      {0},
+    .common = {
+        .tag           = HARDWARE_MODULE_TAG,
+        .version_major = 1,
+        .version_minor = 0,
+        .id            = CAMERA_HARDWARE_MODULE_ID,
+        .name          = "Camera Module",
+        .author        = "The Android Open Source Project",
+        .methods       = &android::CameraFactory::mCameraModuleMethods,
+        .dso           = NULL,
+        .reserved      = {0},
     },
-    get_number_of_cameras:  android::CameraFactory::get_number_of_cameras,
-    get_camera_info:        android::CameraFactory::get_camera_info,
+    .get_number_of_cameras = android::CameraFactory::get_number_of_cameras,
+    .get_camera_info       = android::CameraFactory::get_camera_info,
 };