diff options
author | Igor Pashev <pashev.igor@gmail.com> | 2014-08-30 23:23:41 +0400 |
---|---|---|
committer | Igor Pashev <pashev.igor@gmail.com> | 2014-08-30 23:23:41 +0400 |
commit | d6177bbbd17ddd3f837485f6cb59e24fbc7f82c5 (patch) | |
tree | 009c30637db1e59410942e9f447f9e310da859e5 /streams | |
parent | 411498f0cc1bfe8762a4d999ac2761a70c305113 (diff) | |
parent | 344e61df0200af758e794b9843ffb37bd89e5259 (diff) | |
download | glibc-d6177bbbd17ddd3f837485f6cb59e24fbc7f82c5.tar.gz |
Merge branch 'release/2.19/master' of git://sourceware.org/git/glibc
Conflicts:
configure.in
include/features.h
io/ftw.c
malloc/arena.c
malloc/malloc.c
malloc/mtrace.c
nptl/allocatestack.c
nptl/nptl-init.c
nptl/pthread_attr_init.c
nptl/pthread_create.c
nptl/pthread_detach.c
nptl/pthread_getschedparam.c
nptl/pthread_setschedparam.c
nptl/pthread_setschedprio.c
nptl/pthread_timedjoin.c
nptl/pthread_tryjoin.c
nptl/sysdeps/unix/sysv/linux/fork.h
nptl/sysdeps/unix/sysv/linux/register-atfork.c
nptl/sysdeps/unix/sysv/linux/unregister-atfork.c
nptl/sysdeps/x86_64/tls.h
nscd/Makefile
sysdeps/unix/inet/syscalls.list
sysdeps/unix/opendir.c
sysdeps/x86_64/multiarch/strcasestr-nonascii.c
Diffstat (limited to 'streams')
-rw-r--r-- | streams/Makefile | 2 | ||||
-rw-r--r-- | streams/fattach.c | 3 | ||||
-rw-r--r-- | streams/fdetach.c | 3 | ||||
-rw-r--r-- | streams/getmsg.c | 3 | ||||
-rw-r--r-- | streams/getpmsg.c | 3 | ||||
-rw-r--r-- | streams/isastream.c | 2 | ||||
-rw-r--r-- | streams/putmsg.c | 3 | ||||
-rw-r--r-- | streams/putpmsg.c | 3 | ||||
-rw-r--r-- | streams/stropts.h | 4 |
9 files changed, 10 insertions, 16 deletions
diff --git a/streams/Makefile b/streams/Makefile index 1d8c64d4ae..eeacd3ab50 100644 --- a/streams/Makefile +++ b/streams/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1998, 2002 Free Software Foundation, Inc. +# Copyright (C) 1998-2014 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/streams/fattach.c b/streams/fattach.c index 22e36df948..73c060da80 100644 --- a/streams/fattach.c +++ b/streams/fattach.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998 Free Software Foundation, Inc. +/* Copyright (C) 1998-2014 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 @@ -29,4 +29,3 @@ fattach (fildes, path) stub_warning (fattach) -#include <stub-tag.h> diff --git a/streams/fdetach.c b/streams/fdetach.c index 9c872caae4..fe031ee25a 100644 --- a/streams/fdetach.c +++ b/streams/fdetach.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998 Free Software Foundation, Inc. +/* Copyright (C) 1998-2014 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 @@ -28,4 +28,3 @@ fdetach (path) stub_warning (fdetach) -#include <stub-tag.h> diff --git a/streams/getmsg.c b/streams/getmsg.c index 20c32aa8a4..0bfee0ae43 100644 --- a/streams/getmsg.c +++ b/streams/getmsg.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998 Free Software Foundation, Inc. +/* Copyright (C) 1998-2014 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 @@ -31,4 +31,3 @@ getmsg (fildes, ctlptr, dataptr, flagsp) stub_warning (getmsg) -#include <stub-tag.h> diff --git a/streams/getpmsg.c b/streams/getpmsg.c index 7d97f5c242..a0c927d323 100644 --- a/streams/getpmsg.c +++ b/streams/getpmsg.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998 Free Software Foundation, Inc. +/* Copyright (C) 1998-2014 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 @@ -32,4 +32,3 @@ getpmsg (fildes, ctlptr, dataptr, bandp, flagsp) stub_warning (getpmsg) -#include <stub-tag.h> diff --git a/streams/isastream.c b/streams/isastream.c index 9b9209b855..9b1033ec9b 100644 --- a/streams/isastream.c +++ b/streams/isastream.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998 Free Software Foundation, Inc. +/* Copyright (C) 1998-2014 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/streams/putmsg.c b/streams/putmsg.c index 80f9f0b92a..eecca7b407 100644 --- a/streams/putmsg.c +++ b/streams/putmsg.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998 Free Software Foundation, Inc. +/* Copyright (C) 1998-2014 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 @@ -31,4 +31,3 @@ putmsg (fildes, ctlptr, dataptr, flags) stub_warning (putmsg) -#include <stub-tag.h> diff --git a/streams/putpmsg.c b/streams/putpmsg.c index b85e14283a..29a923f503 100644 --- a/streams/putpmsg.c +++ b/streams/putpmsg.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998 Free Software Foundation, Inc. +/* Copyright (C) 1998-2014 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 @@ -32,4 +32,3 @@ putpmsg (fildes, ctlptr, dataptr, band, flags) stub_warning (putpmsg) -#include <stub-tag.h> diff --git a/streams/stropts.h b/streams/stropts.h index bf5e59d841..ed0a2392c4 100644 --- a/streams/stropts.h +++ b/streams/stropts.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-2012 Free Software Foundation, Inc. +/* Copyright (C) 1998-2014 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 @@ -38,7 +38,7 @@ typedef __t_uscalar_t t_uscalar_t; # define __t_uscalar_t_defined #endif -/* Get system specific contants. */ +/* Get system specific constants. */ #include <bits/stropts.h> |