Mercurial > hg > octave-nkf > gnulib-hg
changeset 9791:af7bd60c9b2f
Merge branch 'master' of ssh://karl@git.sv.gnu.org/srv/git/gnulib
author | Karl Berry <karl@freefriends.org> |
---|---|
date | Wed, 12 Mar 2008 15:38:55 -0700 |
parents | 5a86a956e493 (current diff) 47a0f373fb6f (diff) |
children | fe07e3d3be04 |
files | |
diffstat | 3 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-03-12 Jim Meyering <meyering@redhat.com> + + Recognize optional cast of the argument to free. + * build-aux/useless-if-before-free: Update regexps. + + * build-aux/bootstrap (gnulib_tool): Remove trailing blanks. + 2008-03-11 Bruno Haible <bruno@clisp.org> Extend AC_LIB_LINKFLAGS to the situation of several libraries provided @@ -19,7 +26,7 @@ AC_LIB_LINKFLAGS_BODY): Use pushdef/popdef instead of define/undefine. 2008-03-10 Peter O'Gorman <bug-gnulib@mlists.thewrittenword.com> - Bruno Haible <bruno@clisp.org> + Bruno Haible <bruno@clisp.org> Make va_copy work with some version of xlc on AIX 5.1. * lib/stdarg.in.h: New file.
--- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -416,7 +416,7 @@ elif test -d .git; then git rm -n "$dir/$file" > /dev/null 2>&1 && found=yes elif test -d .svn; then - svn log -r HEAD "$dir/$file" > /dev/null 2>&1 && found=yes + svn log -r HEAD "$dir/$file" > /dev/null 2>&1 && found=yes else echo "$0: no version control for $dir/$file?" >&2 fi
--- a/build-aux/useless-if-before-free +++ b/build-aux/useless-if-before-free @@ -2,7 +2,7 @@ # Detect instances of "if (p) free (p);". # Likewise for "if (p != NULL) free (p);". And with braces. -my $VERSION = '2008-02-11 08:08'; # UTC +my $VERSION = '2008-03-12 13:06'; # UTC # The definition above must lie within the first 8 lines in order # for the Emacs time-stamp write hook (at end) to update it. # If you change this file with Emacs, please let the write hook @@ -123,8 +123,8 @@ { if ($line =~ /\b(if\s*\(\s*(\S+?)(?:\s*!=\s*NULL)?\s*\) - (?: \s*$regexp\s*\(\s*\2\s*\)| - \s*\{\s*$regexp\s*\(\s*\2\s*\)\s*;\s*\}))/sx) + (?: \s*$regexp\s*\((?:\s*\([^)]+\))\s*\2\s*\)| + \s*\{\s*$regexp\s*\((?:\s*\([^)]+\))\s*\2\s*\)\s*;\s*\}))/sx) { $found_match = 1; $list