This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "GNU M4 source repository".
http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=fa1b673a452f5c7874cb5dd2610b5238cedc4d65 The branch, master has been updated via fa1b673a452f5c7874cb5dd2610b5238cedc4d65 (commit) via c320252821e5d9fd6f3a6c26bcc53730aae2a9e1 (commit) from 312695e1ebb4e9807289f4b9d93b263a61a381a8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fa1b673a452f5c7874cb5dd2610b5238cedc4d65 Author: Gary V. Vaughan <[email protected]> Date: Fri Dec 5 14:22:38 2014 +0000 gnulib: sync with upstream. Notably this moves to the new 64bit obstack implementation. * gnulib: Sync with upstream, for maint.mk bug fixes et al. * build-aux/m4/gnulib-cache.m4, po/Makevars: Regenerate. Signed-off-by: Gary V. Vaughan <[email protected]> commit c320252821e5d9fd6f3a6c26bcc53730aae2a9e1 Author: Gary V. Vaughan <[email protected]> Date: Fri Dec 5 21:13:15 2014 +0000 obstacks: use obstack_blank_fast where possible. In preparation for gnulib API change to obstacks, where obstack_blank cannot shrink memory use any more. * m4/macro.c (trace_flush): `start - len` can be negative, so call obstack_blank_fast, which accepts negative arguments. * modules/m4.c (m4_make_temp): Likewise... -1 is always negative! Signed-off-by: Gary V. Vaughan <[email protected]> ----------------------------------------------------------------------- Summary of changes: build-aux/gnulib | 2 +- build-aux/m4/gnulib-cache.m4 | 2 +- m4/macro.c | 2 +- modules/m4.c | 2 +- po/Makevars | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build-aux/gnulib b/build-aux/gnulib index a4482b6..79002fd 160000 --- a/build-aux/gnulib +++ b/build-aux/gnulib @@ -1 +1 @@ -Subproject commit a4482b667f8c6ba6e89eacb876fab7ff4775dab4 +Subproject commit 79002fdd9f556694728f5ebc2ea0c43c14ef476d diff --git a/build-aux/m4/gnulib-cache.m4 b/build-aux/m4/gnulib-cache.m4 index a31e566..145b3da 100644 --- a/build-aux/m4/gnulib-cache.m4 +++ b/build-aux/m4/gnulib-cache.m4 @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 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 diff --git a/m4/macro.c b/m4/macro.c index 85aa40b..01f5f0f 100644 --- a/m4/macro.c +++ b/m4/macro.c @@ -864,7 +864,7 @@ trace_flush (m4 *context, unsigned int start) fwrite (&str[start], 1, len - start, file); fputc ('\n', file); } - obstack_blank (&context->trace_messages, start - len); + obstack_blank_fast (&context->trace_messages, start - len); } /* Do pre-argument-collection tracing for the macro described in INFO. diff --git a/modules/m4.c b/modules/m4.c index 755bd88..ee97349 100644 --- a/modules/m4.c +++ b/modules/m4.c @@ -732,7 +732,7 @@ m4_make_temp (m4 *context, m4_obstack *obs, const m4_call_info *caller, if (!dir) close (fd); /* Remove NUL, then finish quote. */ - obstack_blank (obs, -1); + obstack_blank_fast (obs, -1); obstack_grow (obs, quotes->str2, quotes->len2); } } diff --git a/po/Makevars b/po/Makevars index 118868e..6f3cd63 100644 --- a/po/Makevars +++ b/po/Makevars @@ -9,9 +9,9 @@ top_builddir = .. # These options get passed to xgettext. XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ \ ---flag=_:1:pass-c-format \ ---flag=N_:1:pass-c-format \ -$${end_of_xgettext_options+} + --flag=_:1:pass-c-format \ + --flag=N_:1:pass-c-format \ + $${end_of_xgettext_options+} # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding hooks/post-receive -- GNU M4 source repository
