diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ec6988c616299cb056e1a5c797aaec21ab4d4660..32a1b7eb372fde31b9efddfdf3cbbee547f96c17 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,4 +1,11 @@
-2004-0903  Matt Austern  <austern@apple.com>
+2004-09-04  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
+
+	* decl.c (grok_declarator): Remove a redundant semicolon.
+
+	* parser.c (cp_parser_decl_specifier_seq, cp_parser_type_specifier):
+	Correct comments describing function parameters.
+
+2004-09-03  Matt Austern  <austern@apple.com>
 	Compile speed improvement.
 	* parser.c (cp_lexer_print_token): Only define if ENABLE_CHECKING set.
 	Otherwise define a stub macro that expands to nothing.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 1aed934a3e5ad319bb86b273af342e0c09e7fd8f..607b907078d8c914c862a9da5a7602df2f1cca43 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -6420,7 +6420,7 @@ grokdeclarator (const cp_declarator *declarator,
 	    if (TREE_CODE (decl) == SCOPE_REF)
 	      {
 		tree qualifying_scope = TREE_OPERAND (decl, 0);
-;
+
 		/* It is valid to write:
 
 		   class C { void f(); };
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index c3f741dff99200c4e7a9b3c7350bf70fc1df26e4..45eb20aa4659d4b8365cf0e7c7776e01dc244046 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -7126,11 +7126,7 @@ cp_parser_simple_declaration (cp_parser* parser,
 
    Set *DECL_SPECS to a representation of the decl-specifier-seq.
 
-   If FRIEND_IS_NOT_CLASS_P is non-NULL, and the `friend' specifier
-   appears, and the entity that will be a friend is not going to be a
-   class, then *FRIEND_IS_NOT_CLASS_P will be set to TRUE.  Note that
-   even if *FRIEND_IS_NOT_CLASS_P is FALSE, the entity to which
-   friendship is granted might not be a class.
+   The parser flags FLAGS is used to control type-specifier parsing.
 
    *DECLARES_CLASS_OR_ENUM is set to the bitwise or of the following
    flags:
@@ -9227,9 +9223,10 @@ cp_parser_explicit_specialization (cp_parser* parser)
    class-specifier, enum-specifier, or elaborated-type-specifier, a
    TREE_TYPE is returned; otherwise, a TYPE_DECL is returned.
 
-   If IS_FRIEND is TRUE then this type-specifier is being declared a
-   `friend'.  If IS_DECLARATION is TRUE, then this type-specifier is
-   appearing in a decl-specifier-seq.
+   The parser flags FLAGS is used to control type-specifier parsing.
+
+   If IS_DECLARATION is TRUE, then this type-specifier is appearing
+   in a decl-specifier-seq.
 
    If DECLARES_CLASS_OR_ENUM is non-NULL, and the type-specifier is a
    class-specifier, enum-specifier, or elaborated-type-specifier, then