[Ada] Consistently use explicit Entity_Id type instead of alias

[gcc.git] / libcpp / pch.c

diff --git a/libcpp/pch.c b/libcpp/pch.c
index 04d7094b068faa3bef34423fb00b31ab72e9d2c8..fcdf3875d0b214ec4d3d7bf4192c7d33da2c0cee 100644 (file)
--- a/libcpp/pch.c
+++ b/libcpp/pch.c
@@ -1,5 +1,5 @@
 /* Part of CPP library.  (Precompiled header reading/writing.)
-   Copyright (C) 2000-2018 Free Software Foundation, Inc.
+   Copyright (C) 2000-2020 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -437,7 +437,7 @@ _cpp_restore_pushed_macros (cpp_reader *r, FILE *f)
            return 0;
 
          p->definition = defn;
-         if (fread (&(p->line), sizeof (source_location), 1, f) != 1)
+         if (fread (&(p->line), sizeof (location_t), 1, f) != 1)
            return 0;
          defnlen = 0;
          if (fread (&defnlen, sizeof (defnlen), 1, f) != 1)
@@ -501,7 +501,7 @@ _cpp_save_pushed_macros (cpp_reader *r, FILE *f)
          if (fwrite (&defnlen, sizeof (size_t), 1, f) != 1
              || fwrite (pp[i]->definition, defnlen, 1, f) != 1)
            return 0;
-         if (fwrite (&(pp[i]->line), sizeof (source_location), 1, f) != 1)
+         if (fwrite (&(pp[i]->line), sizeof (location_t), 1, f) != 1)
            return 0;
          defnlen = 0;
          defnlen |= (pp[i]->syshdr != 0 ? 1 : 0);
@@ -811,8 +811,6 @@ cpp_read_state (cpp_reader *r, const char *name, FILE *f,
     s->n_false         = cpp_lookup (r, DSC("false"));
     s->n__VA_ARGS__     = cpp_lookup (r, DSC("__VA_ARGS__"));
     s->n__VA_OPT__      = cpp_lookup (r, DSC("__VA_OPT__"));
-    s->n__has_include__ = cpp_lookup (r, DSC("__has_include__"));
-    s->n__has_include_next__ = cpp_lookup (r, DSC("__has_include_next__"));
   }
 
   old_state = r->state;