diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 79b575528b6..a4465b249fd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-07  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* c-common.c (combine_strings): Only warn about long strings for C.
+
 Tue Nov  7 19:44:30 2000  J"orn Rennecke <amylaar@redhat.com>
 
 	* combine.c (distribute_notes): Fix typo in last change.
diff --git a/gcc/c-common.c b/gcc/c-common.c
index ac0a1010707..247145cf2ab 100644
--- a/gcc/c-common.c
+++ b/gcc/c-common.c
@@ -426,7 +426,7 @@ combine_strings (strings)
   /* Compute the number of elements, for the array type.  */
   nchars = wide_flag ? length / wchar_bytes : length;
 
-  if (pedantic && nchars > nchars_max)
+  if (pedantic && nchars > nchars_max && c_language == clk_c)
     pedwarn ("string length `%d' is greater than the minimum length `%d' ISO C%d is required to support",
 	     nchars, nchars_max, flag_isoc99 ? 99 : 89);