aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorPaul Eggert2020-08-23 14:59:15 -0700
committerPaul Eggert2020-08-23 15:01:51 -0700
commitdf589d36817a8804d67f133890b2f453aefdf3c1 (patch)
tree0cb06033b33420f78871abe26af3b00cffdc03be /admin
parent42ec41251584c480ee3286ff369c18629f52a7d5 (diff)
downloademacs-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-DEFINES2
-rwxr-xr-xadmin/merge-gnulib2
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
124HAVE_DECL_STRTOLL 124HAVE_DECL_STRTOLL
125HAVE_DECL_STRTOULL 125HAVE_DECL_STRTOULL
126HAVE_DECL_STRTOUMAX 126HAVE_DECL_STRTOUMAX
127HAVE_DECL_SYS_SIGLIST
128HAVE_DECL_TZNAME 127HAVE_DECL_TZNAME
129HAVE_DECL___SYS_SIGLIST
130HAVE_DIALOGS 128HAVE_DIALOGS
131HAVE_DIFFTIME 129HAVE_DIFFTIME
132HAVE_DUP2 130HAVE_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