From dbb4e0c6aa853502b33f6f2fc82f908c382fee98 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@gcc.gnu.org>
Date: Thu, 10 Jun 2004 10:11:29 +0200
Subject: [PATCH] Oops.

From-SVN: r82903
---
 gcc/ChangeLog    | 3 ---
 gcc/cp/ChangeLog | 6 ++++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f3386bcecb1..fa7c16d3489 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -20,9 +20,6 @@
 	BUILT_IN_FWRITE_UNLOCKED, BUILT_IN_VFPRINTF, BUILT_IN_VFSCANF): Use
 	the above *FILEPTR* types instead of *PTR*.
 
-	* decl.c (duplicate_decls): Handle fileptr_type_node arguments
-	specially.
-
 2004-06-09  Daniel Berlin <dberlin@dberlin.org>
 
 	* tree-ssa.c (verify_ssa): Verify that vdefs/makes_aliased_stores 
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8699c9818fc..c080fb3aba7 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-10  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/14791
+	* decl.c (duplicate_decls): Handle fileptr_type_node arguments
+	specially.
+
 2004-06-09  Mark Mitchell  <mark@codesourcery.com>
 
 	Revert:
-- 
2.30.2