[llvm-branch-commits] [libc] c85cf98 - Revert "[libc] Avoid host header collisions in full builds (-nostdinc) (#187025)"

[via llvm-branch-commits]

Author: Alexey Samsonov
Date: 2026-03-17T10:50:53-07:00
New Revision: c85cf9880347a04708a20cb7a12a4f028874cbe8

URL: https://github.com/llvm/llvm-project/commit/c85cf9880347a04708a20cb7a12a4f028874cbe8
DIFF: https://github.com/llvm/llvm-project/commit/c85cf9880347a04708a20cb7a12a4f028874cbe8.diff

LOG: Revert "[libc] Avoid host header collisions in full builds (-nostdinc) (#187025)"

This reverts commit bed77a1d9bf40c1ab0a55572df148e5a8c44e975.

Added: 
    

Modified: 
    libc/hdr/func/aligned_alloc.h
    libc/hdr/stdint_proxy.h

Removed: 
    


################################################################################
diff  --git a/libc/hdr/func/aligned_alloc.h b/libc/hdr/func/aligned_alloc.h
index 3c197f4671a76..b3436dfee1f23 100644
--- a/libc/hdr/func/aligned_alloc.h
+++ b/libc/hdr/func/aligned_alloc.h
@@ -11,11 +11,7 @@
 
 #ifdef LIBC_FULL_BUILD
 #include "hdr/types/size_t.h"
-#ifdef __cplusplus
-extern "C" void *aligned_alloc(size_t, size_t) noexcept;
-#else
 extern "C" void *aligned_alloc(size_t, size_t);
-#endif
 
 #else // Overlay mode
 

diff  --git a/libc/hdr/stdint_proxy.h b/libc/hdr/stdint_proxy.h
index d5c600d5a28bf..8e815679a4e24 100644
--- a/libc/hdr/stdint_proxy.h
+++ b/libc/hdr/stdint_proxy.h
@@ -13,10 +13,6 @@
 // that is `libc.include.stdint` is added to the dependency of all targets
 // that use <stdint.h> header.
 
-#ifdef LIBC_FULL_BUILD
-#include "include/llvm-libc-macros/stdint-macros.h"
-#else
 #include <stdint.h>
-#endif
 
 #endif // LLVM_LIBC_HDR_STDINT_PROXY_H