Revert r280743 and r280745. Remove <cstdlib> include from `<exception>`

Apparently I missed a number of additional include which need to be added.
Reverting so I can recommit as a single patch with all of the required includes.

llvm-svn: 280752

diff --git a/libcxx/include/exception b/libcxx/include/exception
index 686e4ec..a130bca 100644 (file)
--- a/libcxx/include/exception
+++ b/libcxx/include/exception
@@ -80,6 +80,10 @@ template <class E> void rethrow_if_nested(const E& e);
 #include <__config>
 #include <cstddef>
 #include <type_traits>
+#if defined(_LIBCPP_NO_EXCEPTIONS)
+#include <cstdio>
+#include <cstdlib>
+#endif
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header

diff --git a/libcxx/include/typeinfo b/libcxx/include/typeinfo
index 0c6dfe3..d3155e4 100644 (file)
--- a/libcxx/include/typeinfo
+++ b/libcxx/include/typeinfo
@@ -61,7 +61,6 @@ public:
 #include <exception>
 #include <cstddef>
 #include <cstdint>
-#include <cstdlib>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header