This revision was automatically updated to reflect the committed changes. Closed by commit rL305394: PR32476: __nop_locale_mgmt.h not needed with newlib 2.5+ (authored by jyknight).
Changed prior to commit: https://reviews.llvm.org/D32146?vs=102265&id=102562#toc Repository: rL LLVM https://reviews.llvm.org/D32146 Files: libcxx/trunk/include/support/newlib/xlocale.h Index: libcxx/trunk/include/support/newlib/xlocale.h =================================================================== --- libcxx/trunk/include/support/newlib/xlocale.h +++ libcxx/trunk/include/support/newlib/xlocale.h @@ -16,7 +16,10 @@ #include <clocale> #include <cwctype> #include <ctype.h> +#if !defined(__NEWLIB__) || __NEWLIB__ < 2 || \ + __NEWLIB__ == 2 && __NEWLIB_MINOR__ < 5 #include <support/xlocale/__nop_locale_mgmt.h> +#endif #include <support/xlocale/__posix_l_fallback.h> #include <support/xlocale/__strtonum_fallback.h>
Index: libcxx/trunk/include/support/newlib/xlocale.h =================================================================== --- libcxx/trunk/include/support/newlib/xlocale.h +++ libcxx/trunk/include/support/newlib/xlocale.h @@ -16,7 +16,10 @@ #include <clocale> #include <cwctype> #include <ctype.h> +#if !defined(__NEWLIB__) || __NEWLIB__ < 2 || \ + __NEWLIB__ == 2 && __NEWLIB_MINOR__ < 5 #include <support/xlocale/__nop_locale_mgmt.h> +#endif #include <support/xlocale/__posix_l_fallback.h> #include <support/xlocale/__strtonum_fallback.h>
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
