diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index f7c330c51439..4b66c84174d4 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-29  Dodji Seketeli  <dodji@redhat.com>
+
+	* lex.c (lex_raw_string): Change C++ style comments into C style
+	comments.
+    	(lex_string): Likewise.
+
 2012-04-27   Ollie Wild  <aaw@google.com>
 
 	* include/cpplib.h (struct cpp_options): Add new field,
diff --git a/libcpp/lex.c b/libcpp/lex.c
index 7e2671ef026f..c4dd6035c9bd 100644
--- a/libcpp/lex.c
+++ b/libcpp/lex.c
@@ -1561,7 +1561,7 @@ lex_raw_string (cpp_reader *pfile, cpp_token *token, const uchar *base,
 	 extension by other front ends such as clang. */
       if (ISALPHA (*cur))
 	{
-	  // Raise a warning, but do not consume subsequent tokens.
+	  /* Raise a warning, but do not consume subsequent tokens.  */
 	  if (CPP_OPTION (pfile, warn_literal_suffix))
 	    cpp_warning_with_line (pfile, CPP_W_LITERAL_SUFFIX,
 				   token->src_loc, 0,
@@ -1692,7 +1692,7 @@ lex_string (cpp_reader *pfile, cpp_token *token, const uchar *base)
 	 extension by other front ends such as clang. */
       if (ISALPHA (*cur))
 	{
-	  // Raise a warning, but do not consume subsequent tokens.
+	  /* Raise a warning, but do not consume subsequent tokens.  */
 	  if (CPP_OPTION (pfile, warn_literal_suffix))
 	    cpp_warning_with_line (pfile, CPP_W_LITERAL_SUFFIX,
 				   token->src_loc, 0,