diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1c0585073d6..a76a82b1017 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-01  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* error.c (locate_error): %P takes an `int', not a `tree'.
+
 Wed Jul  2 00:36:48 CEST 2003  Jan Hubicka  <jh@suse.cz>
 
 	* decl2.c (defer_fn): Set DECL_DEFER_OUTPUT.
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index e26f242ed6d..d12cd6ca152 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -2551,6 +2551,7 @@ locate_error (const char *msgid, va_list ap)
 	    {
 	      /* Just ignore these possibilities.  */
 	    case '%':						break;
+	    case 'P':
 	    case 'd':	(void) va_arg (ap, int);		break;
 	    case 's':	(void) va_arg (ap, char *);		break;
 	    case 'L':	(void) va_arg (ap, enum languages);	break;
@@ -2564,7 +2565,6 @@ locate_error (const char *msgid, va_list ap)
 	    case 'D':
 	    case 'E':
 	    case 'F':
-	    case 'P':
 	    case 'T':
 	    case 'V':
 	      t = va_arg (ap, tree);