From 785ed29f97a5b33df6963c991477f54d2c452582 Mon Sep 17 00:00:00 2001 From: Dimitris Panokostas Date: Tue, 17 Sep 2024 21:31:37 +0200 Subject: [PATCH] ci: avoid using named initializers in file, otherwise we run into a GCC bug This code won't compile with older GCC versions, due to a known bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55227 --- src/pcem/vid_cl5429.cpp | 106 ++++++++++++++++++++++++++-------------- 1 file changed, 70 insertions(+), 36 deletions(-) diff --git a/src/pcem/vid_cl5429.cpp b/src/pcem/vid_cl5429.cpp index a76f0e3a..37fb80ad 100644 --- a/src/pcem/vid_cl5429.cpp +++ b/src/pcem/vid_cl5429.cpp @@ -3057,80 +3057,114 @@ void gd5429_add_status_info(char *s, int max_len, void *p) static device_config_t avga2_config[] = { { - .name = "memory", - .description = "Memory size", - .type = CONFIG_SELECTION, - .default_int = 512, - .selection = + "memory", // name + "Memory size", // description + CONFIG_SELECTION, // type + "", // default_string + 512, // default_int { { - .description = "256 kB", - .value = 256 + "", // description + 256 // value }, { - .description = "512 kB", - .value = 512 + "", // description + 512 // value }, { - .description = "" + "", // description + 0 // value (end of selection) } - }, + } }, { - .type = -1 + "", // name (end of config) + "", // description + -1, // type + "", // default_string + 0, // default_int + { + { + "", // description + 0 // value + } + } } }; static device_config_t gd5429_config[] = { { - .name = "memory", - .description = "Memory size", - .type = CONFIG_SELECTION, - .default_int = 2, - .selection = + "memory", // name + "Memory size", // description + CONFIG_SELECTION, // type + "", // default_string + 2, // default_int { { - .description = "1 MB", - .value = 1 + "1 MB", // description + 1 // value }, { - .description = "2 MB", - .value = 2 + "2 MB", // description + 2 // value }, { - .description = "" + "", // description (end of selection) + 0 // value } - }, + } }, { - .type = -1 + "", // name (end of config) + "", // description + -1, // type + "", // default_string + 0, // default_int + { + { + "", // description + 0 // value + } + } } }; + static device_config_t gd5434_config[] = { { - .name = "memory", - .description = "Memory size", - .type = CONFIG_SELECTION, - .default_int = 4, - .selection = + "memory", // name + "Memory size", // description + CONFIG_SELECTION, // type + "", // default_string + 4, // default_int { { - .description = "2 MB", - .value = 2 + "2 MB", // description + 2 // value }, { - .description = "4 MB", - .value = 4 + "4 MB", // description + 4 // value }, { - .description = "" + "", // description (end of selection) + 0 // value } - }, + } }, { - .type = -1 + "", // name (end of config) + "", // description + -1, // type + "", // default_string + 0, // default_int + { + { + "", // description + 0 // value + } + } } };