summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2016-12-27 16:00:06 -0600
committerEric Blake <eblake@redhat.com>2016-12-29 11:14:06 -0600
commit1515c045e88f433e026384fd9b8478d0a66f4e1c (patch)
treefe2acaa7cf2d2931c3a43b6396d7b07743b94f38
parentf2580cf7921bee2f2a3c204b67790bdef4018b9e (diff)
downloadm4-1515c045e88f433e026384fd9b8478d0a66f4e1c.tar.gz
gnulib: Update to latest
* gnulib: Update to latest. * m4/gnulib-cache.m4: Regenerate. * src/macro.c (expand_macro): Deal with obstack API change. * src/builtin.c (mkstemp_helper): Likewise. Signed-off-by: Eric Blake <eblake@redhat.com>
-rw-r--r--ChangeLog10
m---------gnulib0
-rw-r--r--m4/gnulib-cache.m44
-rw-r--r--src/builtin.c2
-rw-r--r--src/macro.c6
5 files changed, 15 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 5643bea8..6861d51e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2016-12-29 Eric Blake <eblake@redhat.com>
+
+ build: update to latest gnulib
+ * gnulib: Update to latest.
+ * m4/gnulib-cache.m4: Regenerate.
+ * src/macro.c (expand_macro): Deal with obstack API change.
+ * src/builtin.c (mkstemp_helper): Likewise.
+
2014-05-13 Eric Blake <eblake@redhat.com>
doc: fix line-wrapped macro definitions
@@ -5577,7 +5585,7 @@ Mon Jan 22 21:08:52 1990 Rene' Seindal (seindal at diku.dk)
coding: utf-8
End:
- Copyright (C) 1990-1994, 2000-2001, 2003, 2005-2014 Free
+ Copyright (C) 1990-1994, 2000-2001, 2003, 2005-2014, 2016 Free
Software Foundation, Inc.
Copying and distribution of this file, with or without
diff --git a/gnulib b/gnulib
-Subproject a39d4083cab589d7cd6a13e8a4b8db8875261d7
+Subproject 8e63aebd5d3e398a986dcc5cfaaa5409bca30d1
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index f0470f78..034e368c 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
# Specification in the form of a command-line invocation:
-# gnulib-tool --import --dir=. --local-dir=gl --lib=libm4 --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --with-tests --with-c++-tests --avoid=lock-tests --avoid=tls-tests --makefile-name=gnulib.mk --no-conditional-dependencies --no-libtool --macro-prefix=M4 announce-gen assert autobuild avltree-oset binary-io c-stack clean-temp cloexec close-stream closein config-h dirname error execute fclose fdl-1.3 fflush filenamecat fopen fopen-safer fseeko gendocs getopt-gnu git-version-gen gnu-web-doc-update gnumakefile gnupload gpl-3.0 ignore-value intprops maintainer-makefile manywarnings memchr2 mkstemp obstack progname regex rename sigaction sigpipe spawn-pipe stdbool stdint stdlib-safer strsignal strstr strtod unlocked-io update-copyright vc-list-files verror version-etc version-etc-fsf wait-process xalloc xoset xprintf xvasprintf-posix
+# gnulib-tool --import --local-dir=gl --lib=libm4 --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --with-tests --with-c++-tests --avoid=lock-tests --avoid=tls-tests --makefile-name=gnulib.mk --no-conditional-dependencies --no-libtool --macro-prefix=M4 announce-gen assert autobuild avltree-oset binary-io c-stack clean-temp cloexec close-stream closein config-h dirname error execute fclose fdl-1.3 fflush filenamecat fopen fopen-safer fseeko gendocs getopt-gnu git-version-gen gnu-web-doc-update gnumakefile gnupload gpl-3.0 ignore-value intprops maintainer-makefile manywarnings memchr2 mkstemp obstack progname regex rename sigaction sigpipe spawn-pipe stdbool stdint stdlib-safer strsignal strstr strtod unlocked-io update-copyright vc-list-files verror version-etc version-etc-fsf wait-process xalloc xoset xprintf xvasprintf-posix
# Specification in the form of a few gnulib-tool.m4 macro invocations:
gl_LOCAL_DIR([gl])
diff --git a/src/builtin.c b/src/builtin.c
index 1e0ff256..03566b0a 100644
--- a/src/builtin.c
+++ b/src/builtin.c
@@ -1426,7 +1426,7 @@ mkstemp_helper (struct obstack *obs, const char *me, const char *pattern,
{
close (fd);
/* Remove NUL, then finish quote. */
- obstack_blank (obs, -1);
+ obstack_blank_fast (obs, -1);
obstack_grow (obs, rquote.string, rquote.length);
}
}
diff --git a/src/macro.c b/src/macro.c
index da6f8654..c7ac4b59 100644
--- a/src/macro.c
+++ b/src/macro.c
@@ -46,8 +46,8 @@ static struct obstack argc_stack;
/* The shared stack of pointers to collected arguments for macro
calls. This object is never finished; we exploit the fact that
- obstack_blank is documented to take a negative size to reduce the
- size again. */
+ obstack_blank_fast is documented to take a negative size to reduce
+ the size again. */
static struct obstack argv_stack;
/*----------------------------------------------------------------------.
@@ -387,5 +387,5 @@ expand_macro (symbol *sym)
obstack_free (&argc_stack, argv[0]);
else
obstack_free (&arguments, NULL);
- obstack_blank (&argv_stack, -argc * sizeof (token_data *));
+ obstack_blank_fast (&argv_stack, -argc * sizeof (token_data *));
}