diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-04-01 12:55:33 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-04-01 12:55:33 -0700 |
| commit | 8408257cd66435af849f493c10c7f0e8d1d5fa3b (patch) | |
| tree | 8b05963e8608b22f71620f512679d7cd5b1de548 /system/include/libcxx/sstream | |
| parent | a8e4801c7d38033fff760ea26a4579aa324e303e (diff) | |
| parent | 36600f34ef0ec2cf75165be3753567e256f514db (diff) | |
Merge branch 'incoming'
Diffstat (limited to 'system/include/libcxx/sstream')
| -rw-r--r-- | system/include/libcxx/sstream | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/system/include/libcxx/sstream b/system/include/libcxx/sstream index a2a0d31a..22450f0a 100644 --- a/system/include/libcxx/sstream +++ b/system/include/libcxx/sstream @@ -175,7 +175,11 @@ typedef basic_stringstream<wchar_t> wstringstream; #include <istream> #include <string> +#include <__undef_min_max> + +#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header +#endif _LIBCPP_BEGIN_NAMESPACE_STD |