diff options
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 5 | ||||
| -rw-r--r-- | libcpp/include/cpplib.h | 4 | ||||
| -rw-r--r-- | libcpp/init.c | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 36a2fbc..f604c48 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,8 @@ +2009-05-15 Ian Lance Taylor <iant@google.com> + + * include/cpplib.h (enum cpp_builtin_type): Rename from enum + builtin_type. Change all uses. + 2009-05-14 Manuel Lopez-Ibanez <manu@gcc.gnu.org> PR cpp/36674 diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h index 83439c7..effe9a0 100644 --- a/libcpp/include/cpplib.h +++ b/libcpp/include/cpplib.h @@ -578,7 +578,7 @@ enum node_type /* Different flavors of builtin macro. _Pragma is an operator, but we handle it with the builtin code for efficiency reasons. */ -enum builtin_type +enum cpp_builtin_type { BT_SPECLINE = 0, /* `__LINE__' */ BT_DATE, /* `__DATE__' */ @@ -624,7 +624,7 @@ union GTY(()) _cpp_hashnode_value { /* Answers to an assertion. */ struct answer * GTY ((tag ("NTV_ANSWER"))) answers; /* Code for a builtin macro. */ - enum builtin_type GTY ((tag ("NTV_BUILTIN"))) builtin; + enum cpp_builtin_type GTY ((tag ("NTV_BUILTIN"))) builtin; /* Macro argument index. */ unsigned short GTY ((tag ("NTV_ARGUMENT"))) arg_index; }; diff --git a/libcpp/init.c b/libcpp/init.c index aef3998..0f6f49f 100644 --- a/libcpp/init.c +++ b/libcpp/init.c @@ -419,7 +419,7 @@ cpp_init_special_builtins (cpp_reader *pfile) if (b->always_warn_if_redefined || CPP_OPTION (pfile, warn_builtin_macro_redefined)) hp->flags |= NODE_WARN; - hp->value.builtin = (enum builtin_type) b->value; + hp->value.builtin = (enum cpp_builtin_type) b->value; } } |