Mercurial > hg > CbC > CbC_gcc
comparison gcc/c/c-decl.c @ 147:1ccf269e73e8
remove merge mark
author | anatofuz |
---|---|
date | Sun, 01 Mar 2020 16:36:00 +0900 |
parents | 351920fa3827 |
children |
comparison
equal
deleted
inserted
replaced
146:351920fa3827 | 147:1ccf269e73e8 |
---|---|
9137 finish_enum (enumtype, nreverse (value_chain), NULL_TREE); | 9137 finish_enum (enumtype, nreverse (value_chain), NULL_TREE); |
9138 | 9138 |
9139 input_location = saved_loc; | 9139 input_location = saved_loc; |
9140 return enumtype; | 9140 return enumtype; |
9141 } | 9141 } |
9142 >>>>>>> merge rev | 9142 |
9143 | 9143 |
9144 /* Create the FUNCTION_DECL for a function definition. | 9144 /* Create the FUNCTION_DECL for a function definition. |
9145 DECLSPECS, DECLARATOR and ATTRIBUTES are the parts of | 9145 DECLSPECS, DECLARATOR and ATTRIBUTES are the parts of |
9146 the declaration; they describe the function's name and the type it returns, | 9146 the declaration; they describe the function's name and the type it returns, |
9147 but twisted together in a fashion that parallels the syntax of C. | 9147 but twisted together in a fashion that parallels the syntax of C. |