aboutsummaryrefslogtreecommitdiff
path: root/system/include/libcxx/codecvt
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-04-01 12:55:33 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-04-01 12:55:33 -0700
commit8408257cd66435af849f493c10c7f0e8d1d5fa3b (patch)
tree8b05963e8608b22f71620f512679d7cd5b1de548 /system/include/libcxx/codecvt
parenta8e4801c7d38033fff760ea26a4579aa324e303e (diff)
parent36600f34ef0ec2cf75165be3753567e256f514db (diff)
Merge branch 'incoming'
Diffstat (limited to 'system/include/libcxx/codecvt')
-rw-r--r--system/include/libcxx/codecvt2
1 files changed, 2 insertions, 0 deletions
diff --git a/system/include/libcxx/codecvt b/system/include/libcxx/codecvt
index 86fdc727..6c44e343 100644
--- a/system/include/libcxx/codecvt
+++ b/system/include/libcxx/codecvt
@@ -55,7 +55,9 @@ class codecvt_utf8_utf16
#include <__config>
#include <__locale>
+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
+#endif
_LIBCPP_BEGIN_NAMESPACE_STD