From 6d07b345db3406425a27d565969fc04993eae98a Mon Sep 17 00:00:00 2001 From: KO Myung-Hun Date: Tue, 19 Jan 2021 01:40:07 +0900 Subject: [PATCH] spawn: Use special invocation for on OS/2 kLIBC. * lib/spawn.in.h: Use special invocation to include properly on OS/2 kLIBC. --- ChangeLog | 6 ++++++ lib/spawn.in.h | 22 ++++++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f2e21a4689..228a784ce7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2021-01-19 KO Myung-Hun + + spawn: Use special invocation for on OS/2 kLIBC. + * lib/spawn.in.h: Use special invocation to include properly + on OS/2 kLIBC. + 2021-01-18 Bruno Haible noreturn tests: Avoid test failure on Solaris 10/x86 with cc. diff --git a/lib/spawn.in.h b/lib/spawn.in.h index 326b79e6c9..35e78e6cff 100644 --- a/lib/spawn.in.h +++ b/lib/spawn.in.h @@ -15,16 +15,33 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef _@GUARD_PREFIX@_SPAWN_H - #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ #endif @PRAGMA_COLUMNS@ +#if defined _GL_ALREADY_INCLUDING_SPAWN_H +/* Special invocation convention: + On OS/2 kLIBC, includes . Then -> + -> -> are included by GNULIB. + In this situation, struct sched_param is not yet defined. */ + +#@INCLUDE_NEXT@ @NEXT_SPAWN_H@ + +#else + +#ifndef _@GUARD_PREFIX@_SPAWN_H +/* Normal invocation convention. */ + /* The include_next requires a split double-inclusion guard. */ #if @HAVE_SPAWN_H@ + +# define _GL_ALREADY_INCLUDING_SPAWN_H + # @INCLUDE_NEXT@ @NEXT_SPAWN_H@ + +# define _GL_ALREADY_INCLUDING_SPAWN_H + #endif #ifndef _@GUARD_PREFIX@_SPAWN_H @@ -972,3 +989,4 @@ _GL_WARN_ON_USE (posix_spawn_file_actions_addfchdir, #endif /* _@GUARD_PREFIX@_SPAWN_H */ #endif /* _@GUARD_PREFIX@_SPAWN_H */ +#endif -- 2.39.5