diff --git a/src/tools/rc/compile.h b/src/tools/rc/compile.h index e58c18bb8b..47726e1835 100644 --- a/src/tools/rc/compile.h +++ b/src/tools/rc/compile.h @@ -77,7 +77,7 @@ struct list_t }; // Used by the parser to pass around resource IDs. -struct id_t +struct res_id_t { bool has_id; bool has_name; diff --git a/src/tools/rc/parser.y b/src/tools/rc/parser.y index fc658253db..528f0d0750 100644 --- a/src/tools/rc/parser.y +++ b/src/tools/rc/parser.y @@ -60,7 +60,7 @@ typedef type_tab_t::iterator type_iter_t; static type_tab_t type_table; // symbol table for data types -static void add_user_type(id_t, type_code, char*, list_t); +static void add_user_type(res_id_t, type_code, char*, list_t); typedef std::map define_tab_t; typedef define_tab_t::iterator define_iter_t; @@ -95,7 +95,7 @@ static data_t cast(type_t, data_t); static data_t unary_expr(data_t, char); static data_t binary_expr(data_t, data_t, char); -static void add_resource(id_t, type_code, data_t); +static void add_resource(res_id_t, type_code, data_t); //------------------------------------------------------------------------------ %} @@ -109,7 +109,7 @@ static void add_resource(id_t, type_code, data_t); double f; char* I; type_code t; - id_t id; + res_id_t id; data_t d; list_t l; field_t F; @@ -550,7 +550,7 @@ static void add_builtin_type(type_code code, char* name) //------------------------------------------------------------------------------ -void add_user_type(id_t id, type_code code, char* name, list_t list) +void add_user_type(res_id_t id, type_code code, char* name, list_t list) { if (type_table.find(name) != type_table.end()) { @@ -1390,7 +1390,7 @@ data_t binary_expr(data_t data1, data_t data2, char oper) //------------------------------------------------------------------------------ -void add_resource(id_t id, type_code code, data_t data) +void add_resource(res_id_t id, type_code code, data_t data) { if (!id.has_id) {