diff options
author | Jim Meyering <meyering@redhat.com> | 2010-05-09 18:34:09 +0200 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2010-05-09 18:34:09 +0200 |
commit | 6ef1f1f7086021b90c81636de26373c3fe472e5c (patch) | |
tree | beed4eda5ce5153f86e3089791ad6d6d96774b51 | |
parent | 6cfdf0ab03ce32dad30460e8fd00e7ecc9db5a7b (diff) | |
download | diffutils-6ef1f1f7086021b90c81636de26373c3fe472e5c.tar.gz |
build: rely on gnulib's sigprocmask module
* src/sdiff.c: Remove #if-!HAVE_SIGPROCMASK-guarded code.
* bootstrap.conf (gnulib_modules): Add sigprocmask.
-rw-r--r-- | bootstrap.conf | 1 | ||||
-rw-r--r-- | src/sdiff.c | 23 |
2 files changed, 1 insertions, 23 deletions
diff --git a/bootstrap.conf b/bootstrap.conf index 71fbd3f..aa1e8c3 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -55,6 +55,7 @@ progname propername regex sh-quote +sigprocmask stat-macros stat-time strcase diff --git a/src/sdiff.c b/src/sdiff.c index 4344e8d..c0b35b2 100644 --- a/src/sdiff.c +++ b/src/sdiff.c @@ -102,29 +102,6 @@ static int const sigs[] = { # define signal_handler(sig, handler) signal (sig, handler) #endif -#if ! HAVE_SIGPROCMASK -# define sigset_t int -# define sigemptyset(s) (*(s) = 0) -# ifndef sigmask -# define sigmask(sig) (1 << ((sig) - 1)) -# endif -# define sigaddset(s, sig) (*(s) |= sigmask (sig)) -# ifndef SIG_BLOCK -# define SIG_BLOCK 0 -# endif -# ifndef SIG_SETMASK -# define SIG_SETMASK (! SIG_BLOCK) -# endif -# if ! HAVE_SIGBLOCK -# define sigblock(mask) (mask) -# define sigsetmask(mask) (mask) -# endif -# define sigprocmask(how, n, o) \ - ((how) == SIG_BLOCK \ - ? ((o) ? (*(sigset_t *) (o) = sigblock (*(n))) : sigblock (*(n))) \ - : sigsetmask (*(n))) -#endif - static bool diraccess (char const *); static int temporary_file (void); |