diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-01-09 15:21:44 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-01-09 15:22:37 -0800 |
| commit | 7668717d6fecd610d71b54a33708038b2ede8cce (patch) | |
| tree | cb635acfc8273c0adf5ef567e57de345244eb76f /lib/signal.in.h | |
| parent | 9e4d523427782ea4e49f4f13b2b99b09660516cc (diff) | |
| download | emacs-7668717d6fecd610d71b54a33708038b2ede8cce.tar.gz | |
Merge from Gnulib
This incorporates:
2018-01-05 maint: Add encoding marker for Emacs to non-ASCII sources
2018-01-04 update-copyright: Handle use of ©
2018-01-04 pthread_sigmask: Avoid compilation error on mingw
2018-01-02 stat-time: silence -Wunused-parameter regression
* build-aux/config.guess, build-aux/config.sub:
* build-aux/update-copyright, doc/misc/texinfo.tex, lib/gnulib.mk.in:
* lib/md5.c, lib/md5.h, lib/sha1.c, lib/sha1.h, lib/sha256.c:
* lib/sha256.h, lib/sha512.c, lib/sha512.h, lib/signal.in.h:
* lib/stat-time.h: Copy from Gnulib, or regenerate.
Diffstat (limited to 'lib/signal.in.h')
| -rw-r--r-- | lib/signal.in.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/signal.in.h b/lib/signal.in.h index 483413dc7f5..7d4927b828e 100644 --- a/lib/signal.in.h +++ b/lib/signal.in.h @@ -137,7 +137,7 @@ _GL_FUNCDECL_RPL (pthread_sigmask, int, _GL_CXXALIAS_RPL (pthread_sigmask, int, (int how, const sigset_t *new_mask, sigset_t *old_mask)); # else -# if !@HAVE_PTHREAD_SIGMASK@ +# if !(@HAVE_PTHREAD_SIGMASK@ || defined pthread_sigmask) _GL_FUNCDECL_SYS (pthread_sigmask, int, (int how, const sigset_t *new_mask, sigset_t *old_mask)); # endif |