i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The (new) definition of id_t in sys/types.h conflicted with my own

Browse Source 
id_t. Renamed mine to res_id_t.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8364 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
mahlzeit
2004-07-09 18:58:24 +00:00
parent 251e8bf93d
commit ca0206bf09
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/rc/compile.h
+1 -1
View File
@@ -77,7 +77,7 @@ struct list_t
}; };
// Used by the parser to pass around resource IDs. // Used by the parser to pass around resource IDs.
struct id_t struct res_id_t
{ {
bool has_id; bool has_id;
bool has_name; bool has_name;
src/tools/rc/parser.y
+5 -5
View File
@@ -60,7 +60,7 @@ typedef type_tab_t::iterator type_iter_t;
static type_tab_t type_table; // symbol table for data types 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<char*, define_t, ident_compare_t> define_tab_t; typedef std::map<char*, define_t, ident_compare_t> define_tab_t;
typedef define_tab_t::iterator define_iter_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 unary_expr(data_t, char);
static data_t binary_expr(data_t, 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; double f;
char* I; char* I;
type_code t; type_code t;
id_t id; res_id_t id;
data_t d; data_t d;
list_t l; list_t l;
field_t F; 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()) 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) if (!id.has_id)
{ {