From 1d9fec7937f45dde5e04cac966a2d9a12f2fc15a Mon Sep 17 00:00:00 2001 From: Yiran Wang Date: Tue, 23 Jun 2015 15:33:17 -0700 Subject: Synchronize with google/gcc-4_9 to r224707 (from r214835) Change-Id: I3d6f06fc613c8f8b6a82143dc44b7338483aac5d --- gcc-4.9/libcpp/directives.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gcc-4.9/libcpp/directives.c') diff --git a/gcc-4.9/libcpp/directives.c b/gcc-4.9/libcpp/directives.c index 3486a48..22a034d 100644 --- a/gcc-4.9/libcpp/directives.c +++ b/gcc-4.9/libcpp/directives.c @@ -549,6 +549,11 @@ lex_macro_node (cpp_reader *pfile, bool is_def_or_undef) if (is_def_or_undef && node == pfile->spec_nodes.n_defined) cpp_error (pfile, CPP_DL_ERROR, "\"defined\" cannot be used as a macro name"); + else if (is_def_or_undef + && (node == pfile->spec_nodes.n__has_include__ + || node == pfile->spec_nodes.n__has_include_next__)) + cpp_error (pfile, CPP_DL_ERROR, + "\"__has_include__\" cannot be used as a macro name"); else if (! (node->flags & NODE_POISONED)) return node; } @@ -2601,3 +2606,12 @@ _cpp_init_directives (cpp_reader *pfile) node->directive_index = i; } } + +/* Extract header file from a bracket include. Parsing starts after '<'. + The string is malloced and must be freed by the caller. */ +char * +_cpp_bracket_include(cpp_reader *pfile) +{ + return glue_header_name (pfile); +} + -- cgit v1.1