Merging r259840 on top of r259178:

[oota-llvm.git] / lib / Support / Locale.cpp

diff --git a/lib/Support/Locale.cpp b/lib/Support/Locale.cpp
index 35ddf7f11bf62e3086e8d60b9013225c5b99c085..53bc0e36d830e1b59939b2fd279b9195937acf8d 100644 (file)
--- a/lib/Support/Locale.cpp
+++ b/lib/Support/Locale.cpp
@@ -1,3 +1,4 @@
+#include "llvm/Config/llvm-config.h"
 #include "llvm/Support/Locale.h"
 #include "llvm/Support/Unicode.h"
 
@@ -15,7 +16,7 @@ int columnWidth(StringRef Text) {
 
 bool isPrint(int UCS) {
 #if LLVM_ON_WIN32
-  // Restrict characters that we'll try to print to the the lower part of ASCII
+  // Restrict characters that we'll try to print to the lower part of ASCII
   // except for the control characters (0x20 - 0x7E). In general one can not
   // reliably output code points U+0080 and higher using narrow character C/C++
   // output functions in Windows, because the meaning of the upper 128 codes is