From 5945e4ee5c9d2e1fb4876f871ba14fdc1b0e5481 Mon Sep 17 00:00:00 2001 From: KO Myung-Hun Date: Thu, 4 Dec 2014 10:03:34 +0900 Subject: [PATCH] sched: check struct sched_param in spawn.h as well On OS/2 kLIBC, struct sched_param is in spawn.h. So without this a redefinition error occurs when sched.h is inclued by spawn.h. * lib/sched.in.h: Include spawn.h on kLIBC. * lib/sched_h.m4: Check struct sched_param in spawn.h as well. --- ChangeLog | 6 ++++++ lib/sched.in.h | 7 +++++++ m4/sched_h.m4 | 15 +++++++++++---- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f308af032d..533add96f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-12-08 KO Myung-Hun + + sched: check struct sched_param in spawn.h as well + * lib/sched.in.h: Include spawn.h on kLIBC. + * lib/sched_h.m4: Check struct sched_param in spawn.h as well. + 2014-12-08 Martin Kletzander (tiny change) bootstrap: Allow perl modules in $buildreq diff --git a/lib/sched.in.h b/lib/sched.in.h index edebf81080..7be676128b 100644 --- a/lib/sched.in.h +++ b/lib/sched.in.h @@ -35,6 +35,13 @@ and Mac OS X 10.5. */ #include +#ifdef __KLIBC__ + +/* On OS/2 kLIBC, struct sched_param is in spawn.h */ +# include + +#endif + #if !@HAVE_STRUCT_SCHED_PARAM@ # if !GNULIB_defined_struct_sched_param diff --git a/m4/sched_h.m4 b/m4/sched_h.m4 index 329af351ff..49c10ccdc5 100644 --- a/m4/sched_h.m4 +++ b/m4/sched_h.m4 @@ -1,4 +1,4 @@ -# sched_h.m4 serial 6 +# sched_h.m4 serial 7 dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -27,9 +27,16 @@ AC_DEFUN([gl_SCHED_H], fi AC_SUBST([HAVE_SCHED_H]) - AC_CHECK_TYPE([struct sched_param], - [HAVE_STRUCT_SCHED_PARAM=1], [HAVE_STRUCT_SCHED_PARAM=0], - [#include ]) + if test "$HAVE_SCHED_H" = 1; then + AC_CHECK_TYPE([struct sched_param], + [HAVE_STRUCT_SCHED_PARAM=1], [HAVE_STRUCT_SCHED_PARAM=0], + [#include ]) + else + dnl On OS/2 kLIBC, struct sched_param is in spawn.h. + AC_CHECK_TYPE([struct sched_param], + [HAVE_STRUCT_SCHED_PARAM=1], [HAVE_STRUCT_SCHED_PARAM=0], + [#include ]) + fi AC_SUBST([HAVE_STRUCT_SCHED_PARAM]) dnl Ensure the type pid_t gets defined. -- 2.39.5