diff options
| author | Paul Eggert | 2020-08-23 14:59:15 -0700 |
|---|---|---|
| committer | Paul Eggert | 2020-08-23 15:01:51 -0700 |
| commit | df589d36817a8804d67f133890b2f453aefdf3c1 (patch) | |
| tree | 0cb06033b33420f78871abe26af3b00cffdc03be /admin | |
| parent | 42ec41251584c480ee3286ff369c18629f52a7d5 (diff) | |
| download | emacs-df589d36817a8804d67f133890b2f453aefdf3c1.tar.gz emacs-df589d36817a8804d67f133890b2f453aefdf3c1.zip | |
Simplify by using Gnulib sigdescr_np module
Inspired by a straightforward patch by Bruno Haible.
* admin/merge-gnulib (GNULIB_MODULES): Add sigdescr_np.
* configure.ac: Do not check for sys_siglist or __sys_siglist.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* lib/sigdescr_np.c, m4/sigdescr_np.m4: New files, copied from Gnulib.
* src/sysdep.c (sys_siglist, sys_siglist_entries): Remove.
(init_signals): Do not initialize sys_siglist.
(safe_strsignal): Use sigdescr_np instead of sys_siglist.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/CPP-DEFINES | 2 | ||||
| -rwxr-xr-x | admin/merge-gnulib | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index ce9a44436d8..a40b4302723 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES | |||
| @@ -124,9 +124,7 @@ HAVE_DECL_STRTOIMAX | |||
| 124 | HAVE_DECL_STRTOLL | 124 | HAVE_DECL_STRTOLL |
| 125 | HAVE_DECL_STRTOULL | 125 | HAVE_DECL_STRTOULL |
| 126 | HAVE_DECL_STRTOUMAX | 126 | HAVE_DECL_STRTOUMAX |
| 127 | HAVE_DECL_SYS_SIGLIST | ||
| 128 | HAVE_DECL_TZNAME | 127 | HAVE_DECL_TZNAME |
| 129 | HAVE_DECL___SYS_SIGLIST | ||
| 130 | HAVE_DIALOGS | 128 | HAVE_DIALOGS |
| 131 | HAVE_DIFFTIME | 129 | HAVE_DIFFTIME |
| 132 | HAVE_DUP2 | 130 | HAVE_DUP2 |
diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 3f32536a629..164300e1db6 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib | |||
| @@ -40,7 +40,7 @@ GNULIB_MODULES=' | |||
| 40 | manywarnings memmem-simple mempcpy memrchr minmax mkostemp mktime nstrftime | 40 | manywarnings memmem-simple mempcpy memrchr minmax mkostemp mktime nstrftime |
| 41 | pathmax pipe2 pselect pthread_sigmask | 41 | pathmax pipe2 pselect pthread_sigmask |
| 42 | qcopy-acl readlink readlinkat regex | 42 | qcopy-acl readlink readlinkat regex |
| 43 | sig2str socklen stat-time std-gnu11 stdalign stddef stdio | 43 | sig2str sigdescr_np socklen stat-time std-gnu11 stdalign stddef stdio |
| 44 | stpcpy strnlen strtoimax symlink sys_stat sys_time | 44 | stpcpy strnlen strtoimax symlink sys_stat sys_time |
| 45 | tempname time time_r time_rz timegm timer-time timespec-add timespec-sub | 45 | tempname time time_r time_rz timegm timer-time timespec-add timespec-sub |
| 46 | update-copyright unlocked-io utimensat | 46 | update-copyright unlocked-io utimensat |