From: KO Myung-Hun <komh78@gmail.com>
Date: Mon, 18 Jan 2021 16:40:09 +0000 (+0900)
Subject: stddef: Fix compilation for max_align_t on OS/2 kLIBC.
X-Git-Tag: v1.0~3142
X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=4abfff402935537ca64edbd3b2c719b181560a37;p=gnulib.git

stddef: Fix compilation for max_align_t on OS/2 kLIBC.

* lib/stddef.in.h [OS/2 kLIBC]: Include <cstddef> in C++ mode.
---

diff --git a/ChangeLog b/ChangeLog
index ee711d3873..83d724cfbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2021-01-19  KO Myung-Hun  <komh78@gmail.com>
+
+	stddef: Fix compilation for max_align_t on OS/2 kLIBC.
+	* lib/stddef.in.h [OS/2 kLIBC]: Include <cstddef> in C++ mode.
+
 2021-01-19  KO Myung-Hun  <komh78@gmail.com>
 
 	yield: Implement for OS/2 kLIBC.
diff --git a/lib/stddef.in.h b/lib/stddef.in.h
index 77147e9bcc..5d3e087b44 100644
--- a/lib/stddef.in.h
+++ b/lib/stddef.in.h
@@ -103,8 +103,10 @@ typedef long max_align_t;
    we are currently compiling with gcc.
    On MSVC, max_align_t is defined only in C++ mode, after <cstddef> was
    included.  Its definition is good since it has an alignment of 8 (on x86
-   and x86_64).  */
-#if defined _MSC_VER && defined __cplusplus
+   and x86_64).
+   Similarly on OS/2 kLIBC.  */
+#if (defined _MSC_VER || (defined __KLIBC__ && !defined __LIBCN__)) \
+    && defined __cplusplus
 # include <cstddef>
 #else
 # if ! (@HAVE_MAX_ALIGN_T@ || defined _GCC_MAX_ALIGN_T)