aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib.in.h
diff options
context:
space:
mode:
authorPaul Eggert2017-09-10 08:39:55 -0700
committerPaul Eggert2017-09-10 08:40:43 -0700
commitb079ee72ac25590cd8b7b185b32ea5d2d43a9909 (patch)
treebbd4f1a2a0524ce1e380019d7d2b59a5c18f0844 /lib/stdlib.in.h
parentc990f8d93dcc78aa98e58b89bddb666efcea2710 (diff)
downloademacs-b079ee72ac25590cd8b7b185b32ea5d2d43a9909.tar.gz
emacs-b079ee72ac25590cd8b7b185b32ea5d2d43a9909.zip
Merge from gnulib
This incorporates: 2017-09-08 stddef: Avoid conflict with system-defined max_align_t 2017-08-24 warnings: fix compilation with old autoconf 2017-08-23 glob: merge from glibc with Zanella glob changes 2017-08-17 random: Fix test compilation failure on Cygwin 1.5.25 * doc/misc/texinfo.tex, lib/flexmember.h, lib/stddef.in.h: * lib/stdlib.in.h, m4/manywarnings.m4, m4/stdlib_h.m4: * m4/warnings.m4: Copy from Gnulib. * lib/gnulib.mk.in: Regenerate.
Diffstat (limited to 'lib/stdlib.in.h')
-rw-r--r--lib/stdlib.in.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
index c6e68fddc48..ef41c992df5 100644
--- a/lib/stdlib.in.h
+++ b/lib/stdlib.in.h
@@ -597,7 +597,7 @@ _GL_WARN_ON_USE (srandom, "srandom is unportable - "
597#endif 597#endif
598 598
599#if @GNULIB_RANDOM@ 599#if @GNULIB_RANDOM@
600# if !@HAVE_RANDOM@ 600# if !@HAVE_RANDOM@ || !@HAVE_DECL_INITSTATE@
601_GL_FUNCDECL_SYS (initstate, char *, 601_GL_FUNCDECL_SYS (initstate, char *,
602 (unsigned int seed, char *buf, size_t buf_size) 602 (unsigned int seed, char *buf, size_t buf_size)
603 _GL_ARG_NONNULL ((2))); 603 _GL_ARG_NONNULL ((2)));
@@ -614,7 +614,7 @@ _GL_WARN_ON_USE (initstate, "initstate is unportable - "
614#endif 614#endif
615 615
616#if @GNULIB_RANDOM@ 616#if @GNULIB_RANDOM@
617# if !@HAVE_RANDOM@ 617# if !@HAVE_RANDOM@ || !@HAVE_DECL_SETSTATE@
618_GL_FUNCDECL_SYS (setstate, char *, (char *arg_state) _GL_ARG_NONNULL ((1))); 618_GL_FUNCDECL_SYS (setstate, char *, (char *arg_state) _GL_ARG_NONNULL ((1)));
619# endif 619# endif
620_GL_CXXALIAS_SYS (setstate, char *, (char *arg_state)); 620_GL_CXXALIAS_SYS (setstate, char *, (char *arg_state));