[llvm-branch-commits] [libcxx] db67e6f - [libc++] Fix -Wgnu-include-next in stddef.h (#88214)
Tom Stellard via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Tue Apr 16 14:37:23 PDT 2024
Author: Louis Dionne
Date: 2024-04-16T14:36:31-07:00
New Revision: db67e6fb9ad150f18cf9941405746a8400b60545
URL: https://github.com/llvm/llvm-project/commit/db67e6fb9ad150f18cf9941405746a8400b60545
DIFF: https://github.com/llvm/llvm-project/commit/db67e6fb9ad150f18cf9941405746a8400b60545.diff
LOG: [libc++] Fix -Wgnu-include-next in stddef.h (#88214)
As reported in #86843, we must have #pragma GCC system_header before we
use #include_next, otherwise the compiler may not understand that we're
in a system header and may issue a diagnostic for our usage of
(cherry picked from commit 3c4b673af05f53e8a4d1a382b5c86367ea512c9e)
Added:
Modified:
libcxx/include/stddef.h
Removed:
################################################################################
diff --git a/libcxx/include/stddef.h b/libcxx/include/stddef.h
index 470b5408336c6d..1583e78e3739ba 100644
--- a/libcxx/include/stddef.h
+++ b/libcxx/include/stddef.h
@@ -26,6 +26,10 @@
#include <__config>
+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+# pragma GCC system_header
+#endif
+
// Note: This include is outside of header guards because we sometimes get included multiple times
// with
diff erent defines and the underlying <stddef.h> will know how to deal with that.
#include_next <stddef.h>
@@ -33,10 +37,6 @@
#ifndef _LIBCPP_STDDEF_H
# define _LIBCPP_STDDEF_H
-# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-# pragma GCC system_header
-# endif
-
# ifdef __cplusplus
typedef decltype(nullptr) nullptr_t;
# endif
More information about the llvm-branch-commits
mailing list