diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f707e0d189..53dd8046df 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-03  Joel Brobecker  <brobecker@gnat.com>
+
+	* dwarf2read.c (dwarf2_create_include_psymtab): Fix build
+	failure detected by recent versions of GCC.
+	(psymtab_to_symtab_1): No longer use the PST_PRIVATE macro
+	to be consistent with the usage in dwarf2_create_include_psymtab.
+
 2004-05-03  Michael Snyder  <msnyder@redhat.com>
 
 	* mips-tdep.c (mips_gdbarch_init): Fix typo in comment.
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index f9081a3c86..cdb349b105 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -1239,9 +1239,9 @@ dwarf2_create_include_psymtab (char *name, struct partial_symtab *pst,
   /* No private part is necessary for include psymtabs.  This property
      can be used to differentiate between such include psymtabs and
      the regular ones.  If it ever happens that a regular psymtab can
-     legitimally have a NULL PST_PRIVATE part, then we'll have to add a
+     legitimally have a NULL private part, then we'll have to add a
      dedicated field for that in the dwarf2_pinfo structure.  */
-  PST_PRIVATE (subpst) = NULL;
+  subpst->read_symtab_private = NULL;
 }
 
 /* Read the Line Number Program data and extract the list of files
@@ -2109,7 +2109,7 @@ psymtab_to_symtab_1 (struct partial_symtab *pst)
         psymtab_to_symtab_1 (pst->dependencies[i]);
       }
 
-  if (PST_PRIVATE (pst) == NULL)
+  if (pst->read_symtab_private == NULL)
     {
       /* It's an include file, no symbols to read for it.
          Everything is in the parent symtab.  */