* stabsread.c (read_struct_fields): Accept either '$' or '.' as

	the character which introduces a cpp_abbrev or anonymous type.

2 files changed, 13 insertions, 5 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 029db4f..a429a56 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 Thu Nov  4 08:27:24 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
+	* stabsread.c (read_struct_fields): Accept either '$' or '.' as
+	the character which introduces a cpp_abbrev or anonymous type.
+
 	* c-lang.c (c_printstr): Print "" to stream (like all the other
 	output from this function), not gdb_stdout.
 
diff --git a/gdb/stabsread.c b/gdb/stabsread.c
index befb564..ddb18c9 100644
--- a/gdb/stabsread.c
+++ b/gdb/stabsread.c
@@ -2322,11 +2322,16 @@ read_struct_fields (fip, pp, type, objfile)
 
       /* Get the field name.  */
       p = *pp;
-      /* If is starts with CPLUS_MARKER it is a special abbreviation, unless
-	 the CPLUS_MARKER is followed by an underscore, in which case it is
-	 just the name of an anonymous type, which we should handle like any
-	 other type name.  */
-      if (*p == CPLUS_MARKER && p[1] != '_')
+
+      /* If is starts with CPLUS_MARKER it is a special abbreviation,
+	 unless the CPLUS_MARKER is followed by an underscore, in
+	 which case it is just the name of an anonymous type, which we
+	 should handle like any other type name.  We accept either '$'
+	 or '.', because a field name can never contain one of these
+	 characters except as a CPLUS_MARKER (we probably should be
+	 doing that in most parts of GDB).  */
+
+      if ((*p == '$' || *p == '.') && p[1] != '_')
 	{
 	  if (!read_cpp_abbrev (fip, pp, type, objfile))
 	    return 0;