Mercurial > hg > CbC > CbC_gcc
diff libcpp/expr.c @ 67:f6334be47118
update gcc from gcc-4.6-20100522 to gcc-4.6-20110318
| author | nobuyasu <dimolto@cr.ie.u-ryukyu.ac.jp> |
|---|---|
| date | Tue, 22 Mar 2011 17:18:12 +0900 |
| parents | b7f97abdc517 |
| children | 04ced10e8804 |
line wrap: on
line diff
--- a/libcpp/expr.c Tue May 25 18:58:51 2010 +0900 +++ b/libcpp/expr.c Tue Mar 22 17:18:12 2011 +0900 @@ -418,7 +418,7 @@ { int u_or_i = (result & (CPP_N_UNSIGNED|CPP_N_IMAGINARY)); int large = (result & CPP_N_WIDTH) == CPP_N_LARGE - && CPP_OPTION (pfile, warn_long_long); + && CPP_OPTION (pfile, cpp_warn_long_long); if (u_or_i || large) cpp_warning (pfile, large ? CPP_W_LONG_LONG : CPP_W_TRADITIONAL, @@ -427,7 +427,7 @@ } if ((result & CPP_N_WIDTH) == CPP_N_LARGE - && CPP_OPTION (pfile, warn_long_long)) + && CPP_OPTION (pfile, cpp_warn_long_long)) { const char *message = CPP_OPTION (pfile, cplusplus) ? N_("use of C++0x long long integer constant") @@ -700,6 +700,9 @@ node->flags |= NODE_USED; if (node->type == NT_MACRO) { + if ((node->flags & NODE_BUILTIN) + && pfile->cb.user_builtin_macro) + pfile->cb.user_builtin_macro (pfile, node); if (pfile->cb.used_define) pfile->cb.used_define (pfile, pfile->directive_line, node); } @@ -811,7 +814,7 @@ if (CPP_PEDANTIC (pfile)) cpp_error (pfile, CPP_DL_PEDWARN, "assertions are a GCC extension"); - else if (CPP_OPTION (pfile, warn_deprecated)) + else if (CPP_OPTION (pfile, cpp_warn_deprecated)) cpp_warning (pfile, CPP_W_DEPRECATED, "assertions are a deprecated extension"); }