[Ada] Consistently use explicit Entity_Id type instead of alias

[gcc.git] / libcpp / traditional.c

diff --git a/libcpp/traditional.c b/libcpp/traditional.c
index 039fcfe27f547545e77edc3f9c2b9c9575f55540..225e3c2c2f2127d22030963ac40ab8a9006a4552 100644 (file)
--- a/libcpp/traditional.c
+++ b/libcpp/traditional.c
@@ -312,7 +312,11 @@ _cpp_read_logical_line_trad (cpp_reader *pfile)
   do
     {
       if (pfile->buffer->need_line && !_cpp_get_fresh_line (pfile))
-       return false;
+       {
+         /* Now pop the buffer that _cpp_get_fresh_line did not.  */
+         _cpp_pop_buffer (pfile);
+         return false;
+       }
     }
   while (!_cpp_scan_out_logical_line (pfile, NULL, false)
         || pfile->state.skipping);
@@ -326,7 +330,10 @@ fun_like_macro (cpp_hashnode *node)
 {
   if (cpp_builtin_macro_p (node))
     return (node->value.builtin == BT_HAS_ATTRIBUTE
-           || node->value.builtin == BT_HAS_BUILTIN);
+           || node->value.builtin == BT_HAS_STD_ATTRIBUTE
+           || node->value.builtin == BT_HAS_BUILTIN
+           || node->value.builtin == BT_HAS_INCLUDE
+           || node->value.builtin == BT_HAS_INCLUDE_NEXT);
   return node->value.macro->fun_like;
 }