diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8c3bc46f7c8..b106fa5b995 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-27  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
+
+	* cp-tree.h: Fix #error directive.
+
 2008-08-26  Douglas Gregor  <doug.gregor@gmail.com>
 
 	* typeck.c (type_after_usual_arithmetic_conversions): Don't do the
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index cdfd3bcdb3f..ee1ad6ad603 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -48,8 +48,8 @@ extern void cp_cpp_error			(cpp_reader *, int,
      ATTRIBUTE_GCC_CXXDIAG(3,0);
 #ifdef GCC_TOPLEV_H
 #error \
-"In order for the format checking to accept the C++ front end diagnostic\n"
-"framework extensions, you must include this file before toplev.h, not after."
+In order for the format checking to accept the C++ front end diagnostic \
+framework extensions, you must include this file before toplev.h, not after.
 #endif
 #include "toplev.h"
 #include "diagnostic.h"