commit 00612f150f6c4f10a4c62f835f157bdf4511a58b
author Yi Kong <yikong@google.com> Tue Nov 22 20:11:42 2022 +0900
committer Copybara-Service <copybara-worker@google.com> Tue Nov 22 03:50:59 2022 -0800
tree b34d4f0315654e26d980de558ef7b6ccd6aedd3c
parent 18f865afa0ee6048da91eb053d84035d23eec1d4

Revert "[libc++] Remove workarounds for systems that used to require __need_XXX macros"

This reverts commit 119cef40d18c48240854edc553dca61c4e9fdf27.

The change broke multiple builders.

NOKEYCHECK=True
GitOrigin-RevId: 3f65c8fcbe4ed4886500a0b9b939a363b70a43c3

include/stdlib.h

diff --git a/include/stdlib.h b/include/stdlib.h
index 1c990c1..64581b6 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -7,7 +7,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP_STDLIB_H
+#if defined(__need_malloc_and_calloc)
+
+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#  pragma GCC system_header
+#endif
+
+#include_next <stdlib.h>
+
+#elif !defined(_LIBCPP_STDLIB_H)
 #define _LIBCPP_STDLIB_H
 
 /*