diff --git a/clang/lib/Frontend/TextDiagnostic.cpp b/clang/lib/Frontend/TextDiagnostic.cpp
index c2562eb..4fdc254 100644
--- a/clang/lib/Frontend/TextDiagnostic.cpp
+++ b/clang/lib/Frontend/TextDiagnostic.cpp
@@ -1098,8 +1098,8 @@
   unsigned ColNo = SM.getColumnNumber(FID, FileOffset);
   
   // Arbitrarily stop showing snippets when the line is too long.
-  static const unsigned MaxLineLength = 4096;
-  if (ColNo > MaxLineLength)
+  static const unsigned MaxLineLengthToPrint = 4096;
+  if (ColNo > MaxLineLengthToPrint)
     return;
 
   // Rewind from the current position to the start of the line.
@@ -1113,7 +1113,7 @@
     ++LineEnd;
 
   // Arbitrarily stop showing snippets when the line is too long.
-  if (LineEnd - LineStart > MaxLineLength)
+  if (LineEnd - LineStart > MaxLineLengthToPrint)
     return;
 
   // Copy the line of code into an std::string for ease of manipulation.