From: KO Myung-Hun <komh78@gmail.com>
To: bug-gnulib@gnu.org
Subject: [PATCH 1/7] spawn: Use special invocation for <spawn.h> on OS/2 kLIBC
Date: Tue, 19 Jan 2021 01:40:07 +0900 [thread overview]
Message-ID: <20210118164013.42063-1-komh@chollian.net> (raw)
On OS/2 kLIBC, <spawn.h> includes <signal.h>. Then <signal.h> ->
<pthread.h> -> <sched.h> -> <spawn.h> are included by GNULIB.
In this situation, `struct sched_param' is not yet defined.
* lib/spawn.in.h: Use special invocation to include <spawn.h> properly
on OS/2 kLIBC.
---
lib/spawn.in.h | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/lib/spawn.in.h b/lib/spawn.in.h
index 326b79e6c..35e78e6cf 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 <https://www.gnu.org/licenses/>. */
-#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, <spawn.h> includes <signal.h>. Then <signal.h> ->
+ <pthread.h> -> <sched.h> -> <spawn.h> 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.22.0
next reply other threads:[~2021-01-18 17:14 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-18 16:40 KO Myung-Hun [this message]
2021-01-18 16:40 ` [PATCH 2/7] yield: Fix linkage to threadlib on OS/2 kLIBC KO Myung-Hun
2021-01-18 16:40 ` [PATCH 3/7] stddef: Fix compilation for max_align_t " KO Myung-Hun
2021-01-18 16:40 ` [PATCH 4/7] stdlib: putenv() needs a cast " KO Myung-Hun
2021-01-19 17:54 ` Bruno Haible
2021-01-22 14:35 ` KO Myung-Hun
2021-01-31 8:32 ` KO Myung-Hun
2021-01-18 16:40 ` [PATCH 5/7] zerosize-ptr: Fix compilation " KO Myung-Hun
2021-01-19 18:10 ` Bruno Haible
2021-01-22 14:26 ` KO Myung-Hun
2021-01-18 16:40 ` [PATCH 6/7] dirent: Redefine dirfd macro as a rpl function always KO Myung-Hun
2021-01-18 16:40 ` [PATCH 7/7] spawn-pipe: Fix SIGSEGV on OS/2 kLIBC KO Myung-Hun
2021-01-19 18:28 ` [PATCH 1/7] spawn: Use special invocation for <spawn.h> " Bruno Haible
2021-01-22 14:37 ` KO Myung-Hun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://lists.gnu.org/mailman/listinfo/bug-gnulib
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210118164013.42063-1-komh@chollian.net \
--to=komh78@gmail.com \
--cc=bug-gnulib@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).