diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2019-03-10 23:03:48 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2019-03-10 23:05:30 -0700 |
| commit | e2f35443796d423ea5f96a99da425a927327deb2 (patch) | |
| tree | 2ca4cce0736f937dcc60881686500bb4c752a034 /m4 | |
| parent | 89082c823c738b8e3b436e4af1307eefe193eac9 (diff) | |
| download | emacs-e2f35443796d423ea5f96a99da425a927327deb2.tar.gz | |
Update from Gnulib
This incorporates:
2019-03-10 alloca-opt: Fix conflict mingw's new <alloca.h> file
2019-03-03 getloadavg: Write NULL for the null pointer
Reported by Michal Privoznik <mprivozn@redhat.com>.
* lib/getloadavg.c (getloadavg): Write NULL instead of 0.
* build-aux/config.guess, build-aux/move-if-change:
* doc/misc/texinfo.tex, lib/alloca.in.h, lib/getloadavg.c:
* m4/alloca.m4:
Copy from Gnulib.
* lib/gnulib.mk.in: Regenerate.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/alloca.m4 | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/m4/alloca.m4 b/m4/alloca.m4 index 46d60f9c8c8..29bd289b02a 100644 --- a/m4/alloca.m4 +++ b/m4/alloca.m4 @@ -1,4 +1,4 @@ -# alloca.m4 serial 14 +# alloca.m4 serial 15 dnl Copyright (C) 2002-2004, 2006-2007, 2009-2019 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -37,6 +37,13 @@ AC_DEFUN([gl_FUNC_ALLOCA], fi AC_SUBST([ALLOCA_H]) AM_CONDITIONAL([GL_GENERATE_ALLOCA_H], [test -n "$ALLOCA_H"]) + + if test $ac_cv_working_alloca_h = yes; then + HAVE_ALLOCA_H=1 + else + HAVE_ALLOCA_H=0 + fi + AC_SUBST([HAVE_ALLOCA_H]) ]) # Prerequisites of lib/alloca.c. |