From 4abfff402935537ca64edbd3b2c719b181560a37 Mon Sep 17 00:00:00 2001 From: KO Myung-Hun Date: Tue, 19 Jan 2021 01:40:09 +0900 Subject: [PATCH] stddef: Fix compilation for max_align_t on OS/2 kLIBC. * lib/stddef.in.h [OS/2 kLIBC]: Include in C++ mode. --- ChangeLog | 5 +++++ lib/stddef.in.h | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee711d3873..83d724cfbe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2021-01-19 KO Myung-Hun + + stddef: Fix compilation for max_align_t on OS/2 kLIBC. + * lib/stddef.in.h [OS/2 kLIBC]: Include in C++ mode. + 2021-01-19 KO Myung-Hun 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 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 #else # if ! (@HAVE_MAX_ALIGN_T@ || defined _GCC_MAX_ALIGN_T) -- 2.39.5