Update copyright dates with scripts/update-copyrights.

[thirdparty/glibc.git] / assert / assert.c

diff --git a/assert/assert.c b/assert/assert.c
index 40fedb72e83f3f344e305622fb702819c75ae025..21563f684dec487bd1667d0477cda53515afc8bd 100644 (file)
--- a/assert/assert.c
+++ b/assert/assert.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1991,1994-1996,1998,2001,2002,2005,2009,2011
-   Free Software Foundation, Inc.
+/* Copyright (C) 1991-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
@@ -13,9 +12,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <assert.h>
 #include <atomic.h>
@@ -32,7 +30,7 @@ extern const char *__progname;
 
 #include <wchar.h>
 #include <libio/iolibio.h>
-#define fflush(s) INTUSE(_IO_fflush) (s)
+#define fflush(s) _IO_fflush (s)
 
 /* This function, when passed a string containing an asserted
    expression, a filename, and a line number, prints a message
@@ -69,7 +67,7 @@ __assert_fail_base (const char *fmt, const char *assertion, const char *file,
       total = (total + 1 + GLRO(dl_pagesize) - 1) & ~(GLRO(dl_pagesize) - 1);
       struct abort_msg_s *buf = __mmap (NULL, total, PROT_READ | PROT_WRITE,
                                        MAP_ANON | MAP_PRIVATE, -1, 0);
-      if (__builtin_expect (buf != MAP_FAILED, 1))
+      if (__glibc_likely (buf != MAP_FAILED))
        {
          buf->size = total;
          strcpy (buf->msg, str);