diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2020-08-23 14:59:15 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2020-08-23 15:01:51 -0700 |
| commit | df589d36817a8804d67f133890b2f453aefdf3c1 (patch) | |
| tree | 0cb06033b33420f78871abe26af3b00cffdc03be /m4 | |
| parent | 42ec41251584c480ee3286ff369c18629f52a7d5 (diff) | |
| download | emacs-df589d36817a8804d67f133890b2f453aefdf3c1.tar.gz | |
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 'm4')
| -rw-r--r-- | m4/gnulib-comp.m4 | 8 | ||||
| -rw-r--r-- | m4/sigdescr_np.m4 | 17 |
2 files changed, 25 insertions, 0 deletions
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 5bfa1473edd..f3e2cc92853 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -145,6 +145,7 @@ AC_DEFUN([gl_EARLY], # Code from module regex: # Code from module root-uid: # Code from module sig2str: + # Code from module sigdescr_np: # Code from module signal-h: # Code from module snippet/_Noreturn: # Code from module snippet/arg-nonnull: @@ -424,6 +425,11 @@ AC_DEFUN([gl_INIT], AC_LIBOBJ([sig2str]) gl_PREREQ_SIG2STR fi + gl_FUNC_SIGDESCR_NP + if test $HAVE_SIGDESCR_NP = 0; then + AC_LIBOBJ([sigdescr_np]) + fi + gl_STRING_MODULE_INDICATOR([sigdescr_np]) gl_SIGNAL_H gl_TYPE_SOCKLEN_T gt_TYPE_SSIZE_T @@ -1059,6 +1065,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/sha512.h lib/sig2str.c lib/sig2str.h + lib/sigdescr_np.c lib/signal.in.h lib/stat-time.c lib/stat-time.h @@ -1191,6 +1198,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/sha256.m4 m4/sha512.m4 m4/sig2str.m4 + m4/sigdescr_np.m4 m4/signal_h.m4 m4/socklen.m4 m4/ssize_t.m4 diff --git a/m4/sigdescr_np.m4 b/m4/sigdescr_np.m4 new file mode 100644 index 00000000000..f0f3f979e83 --- /dev/null +++ b/m4/sigdescr_np.m4 @@ -0,0 +1,17 @@ +# sigdescr_np.m4 serial 1 +dnl Copyright (C) 2020 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_FUNC_SIGDESCR_NP], +[ + dnl Persuade glibc <string.h> to declare sigdescr_np(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + + AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_CHECK_FUNCS([sigdescr_np]) + if test $ac_cv_func_sigdescr_np = no; then + HAVE_SIGDESCR_NP=0 + fi +]) |