[gawk-diffs] [SCM] gawk branch, gawk-4.1-stable, updated. gawk-4.1.0-551-ga59a81a

[Arnold Robbins]

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 "gawk".

The branch, gawk-4.1-stable has been updated
       via  a59a81a68ca26293f8e3df25da2cfe20e61d7c85 (commit)
      from  16d6377af8d1683a29b9dc7d7ab3e8d4bc1ebd48 (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 -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=a59a81a68ca26293f8e3df25da2cfe20e61d7c85

commit a59a81a68ca26293f8e3df25da2cfe20e61d7c85
Author: Arnold D. Robbins <address@hidden>
Date:   Thu Jan 15 06:20:20 2015 +0200

    Sync some external files.

diff --git a/ChangeLog b/ChangeLog
index 7de6935..605ed80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-15         Arnold D. Robbins     <address@hidden>
+
+       * dfa.h, dfa.c: Sync with grep. Mainly copyright updates.
+       * getopt.c, getopt.h, getopt1.c getopt_int.h: Sync with GLIBC.
+       Mainly copyright updates, one minor code fix.
+
 2015-01-14         Arnold D. Robbins     <address@hidden>
 
        Remove deferred variables.
diff --git a/dfa.c b/dfa.c
index 2ea37b5..4b461fe 100644
--- a/dfa.c
+++ b/dfa.c
@@ -1,5 +1,5 @@
 /* dfa.c - deterministic extended regexp routines for GNU
-   Copyright (C) 1988, 1998, 2000, 2002, 2004-2005, 2007-2014 Free Software
+   Copyright (C) 1988, 1998, 2000, 2002, 2004-2005, 2007-2015 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/dfa.h b/dfa.h
index 4eb4296..7902781 100644
--- a/dfa.h
+++ b/dfa.h
@@ -1,5 +1,5 @@
 /* dfa.h - declarations for GNU deterministic regexp compiler
-   Copyright (C) 1988, 1998, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1998, 2007, 2009-2015 Free Software Foundation, Inc.
 
    This program 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/getopt.c b/getopt.c
index 7bd42bb..4de0b9a 100644
--- a/getopt.c
+++ b/getopt.c
@@ -2,7 +2,7 @@
    NOTE: getopt is part of the C library, so if you don't know what
    "Keep this file name-space clean" means, talk to address@hidden
    before changing it!
-   Copyright (C) 1987-2014 Free Software Foundation, Inc.
+   Copyright (C) 1987-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -613,7 +613,7 @@ _getopt_internal_r (int argc, char *const *argv, const char 
*optstring,
 
                  fputc_unlocked ('\n', fp);
 
-                 if (__builtin_expect (fclose (fp) != EOF, 1))
+                 if (__glibc_likely (fclose (fp) != EOF))
                    {
                      _IO_flockfile (stderr);
 
diff --git a/getopt.h b/getopt.h
index 4471bf5..75cd5e8 100644
--- a/getopt.h
+++ b/getopt.h
@@ -1,5 +1,5 @@
 /* Declarations for getopt.
-   Copyright (C) 1989-2014 Free Software Foundation, Inc.
+   Copyright (C) 1989-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/getopt1.c b/getopt1.c
index 32f2f6a..b61041d 100644
--- a/getopt1.c
+++ b/getopt1.c
@@ -1,5 +1,5 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987-2014 Free Software Foundation, Inc.
+   Copyright (C) 1987-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/getopt_int.h b/getopt_int.h
index d255c8e..03d6227 100644
--- a/getopt_int.h
+++ b/getopt_int.h
@@ -1,5 +1,5 @@
 /* Internal declarations for getopt.
-   Copyright (C) 1989-2014 Free Software Foundation, Inc.
+   Copyright (C) 1989-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog    |    6 ++++++
 dfa.c        |    2 +-
 dfa.h        |    2 +-
 getopt.c     |    4 ++--
 getopt.h     |    2 +-
 getopt1.c    |    2 +-
 getopt_int.h |    2 +-
 7 files changed, 13 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
gawk