[llvm] r187847 - Use correct platform detection macro: __MACOSX__ -> __APPLE__

Alexander Kornienko alexfh at google.com
Tue Aug 6 18:23:28 PDT 2013


Author: alexfh
Date: Tue Aug  6 20:23:28 2013
New Revision: 187847

URL: http://llvm.org/viewvc/llvm-project?rev=187847&view=rev
Log:
Use correct platform detection macro: __MACOSX__ -> __APPLE__

Modified:
    llvm/trunk/unittests/Support/LocaleTest.cpp

Modified: llvm/trunk/unittests/Support/LocaleTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/LocaleTest.cpp?rev=187847&r1=187846&r2=187847&view=diff
==============================================================================
--- llvm/trunk/unittests/Support/LocaleTest.cpp (original)
+++ llvm/trunk/unittests/Support/LocaleTest.cpp Tue Aug  6 20:23:28 2013
@@ -40,7 +40,7 @@ TEST(Locale, columnWidth) {
 
   // FIXME: MacOS implementation of columnWidth seems to not handle incorrect
   // UTF-8 sequences.
-#ifndef __MACOSX__
+#ifndef __APPLE__
   // Invalid UTF-8 strings, columnWidth should error out.
   EXPECT_EQ(-2, columnWidth("\344"));
   EXPECT_EQ(-2, columnWidth("\344\270"));
@@ -58,7 +58,7 @@ TEST(Locale, columnWidth) {
   // characters.
   EXPECT_EQ(-2, columnWidth("\370\200\200\200\200"));     // U+200000
   EXPECT_EQ(-2, columnWidth("\374\200\200\200\200\200")); // U+4000000
-#endif // __MACOSX__
+#endif // __APPLE__
 }
 
 TEST(Locale, isPrint) {
@@ -74,15 +74,15 @@ TEST(Locale, isPrint) {
 
   EXPECT_EQ(true, isPrint(0xAC));
   // FIXME: Figure out if we want to treat SOFT HYPHEN as printable character.
-#ifndef __MACOSX__
+#ifndef __APPLE__
   EXPECT_EQ(false, isPrint(0xAD)); // SOFT HYPHEN
-#endif // __MACOSX__
+#endif // __APPLE__
   EXPECT_EQ(true, isPrint(0xAE));
 
   // MacOS implementation doesn't think it's printable.
-#ifndef __MACOSX__
+#ifndef __APPLE__
   EXPECT_EQ(true, isPrint(0x0377)); // GREEK SMALL LETTER PAMPHYLIAN DIGAMMA
-#endif // __MACOSX__
+#endif // __APPLE__
   EXPECT_EQ(false, isPrint(0x0378)); // <reserved-0378>..<reserved-0379>
 
   EXPECT_EQ(false, isPrint(0x0600)); // ARABIC NUMBER SIGN





More information about the llvm-commits mailing list