# HG changeset patch # User Bruno Haible # Date 1161088992 0 # Node ID c076b72ddb2f4698d106e238e5203dc9ed643cc6 # Parent 6c0cb059c9ea61d150397f1b3a70c309d80e3b35 Use the system's sigset_t if present. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-10-16 Bruno Haible + + * m4/signalblocking.m4 (gl_PREREQ_SIGPROCMASK): Also test for sigset_t. + * lib/sigprocmask.h: Include . + (sigset_t): Use the system's definition if present. + 2006-10-17 Eric Blake * lib/xvasprintf.c (includes): Assume config.h. diff --git a/lib/sigprocmask.h b/lib/sigprocmask.h --- a/lib/sigprocmask.h +++ b/lib/sigprocmask.h @@ -20,6 +20,9 @@ #if ! HAVE_POSIX_SIGNALBLOCKING +/* Mingw defines sigset_t not in , but in . */ +# include + # include "verify.h" /* Maximum signal number + 1. */ @@ -31,7 +34,9 @@ verify (NSIG <= 32); /* A set or mask of signals. */ +# if !HAVE_SIGSET_T typedef unsigned int sigset_t; +# endif /* Test whether a given signal is contained in a signal set. */ extern int sigismember (const sigset_t *set, int sig); diff --git a/m4/signalblocking.m4 b/m4/signalblocking.m4 --- a/m4/signalblocking.m4 +++ b/m4/signalblocking.m4 @@ -1,4 +1,4 @@ -# signalblocking.m4 serial 2 (gettext-0.15.1) +# signalblocking.m4 serial 3 (gettext-0.15.1) dnl Copyright (C) 2001-2002, 2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -25,7 +25,16 @@ fi ]) -# Prerequisites of lib/sigprocmask.c. +# Prerequisites of lib/sigprocmask.h and lib/sigprocmask.c. AC_DEFUN([gl_PREREQ_SIGPROCMASK], [ + AC_CHECK_TYPES([sigset_t], + [gl_cv_type_sigset_t=yes], [gl_cv_type_sigset_t=no], + [#include +/* Mingw defines sigset_t not in , but in . */ +#include ]) + if test $gl_cv_type_sigset_t = yes; then + AC_DEFUN([HAVE_SIGSET_T], + [Define to 1 if you lack the sigprocmask function but have the sigset_t type.]) + fi AC_CHECK_FUNCS_ONCE(raise) ])