From 00ed3326c2fac75592e173e9d731452e9bb769ff Mon Sep 17 00:00:00 2001 From: joseph Date: Thu, 10 Jan 2013 00:28:48 +0000 Subject: Merge changes between r22062 and r22176 from /fsf/trunk. git-svn-id: svn://svn.eglibc.org/trunk@22177 7b3dc134-2b1b-0410-93df-9e9f96275f8d --- libc/mach/Machrules | 3 +-- libc/mach/Makefile | 3 +-- libc/mach/devstream.c | 2 +- libc/mach/lock-intern.h | 2 +- libc/mach/mach.h | 2 +- libc/mach/mach/mach_traps.h | 2 +- libc/mach/mach/mig_support.h | 2 +- libc/mach/mach_init.c | 2 +- libc/mach/mach_init.h | 2 +- libc/mach/mig-alloc.c | 2 +- libc/mach/mig-dealloc.c | 2 +- libc/mach/mig-reply.c | 2 +- libc/mach/msgserver.c | 2 +- libc/mach/mutex-init.c | 2 +- libc/mach/mutex-solid.c | 2 +- libc/mach/setup-thread.c | 2 +- libc/mach/spin-lock.h | 2 +- libc/mach/spin-solid.c | 2 +- 18 files changed, 18 insertions(+), 20 deletions(-) (limited to 'libc/mach') diff --git a/libc/mach/Machrules b/libc/mach/Machrules index d211bce05..ac0197a9b 100644 --- a/libc/mach/Machrules +++ b/libc/mach/Machrules @@ -1,6 +1,5 @@ # Rules for MiG interfaces that want to go into the C library. -# Copyright (C) 1991,1992,1993,1994,1995,1996,1998,1999,2001,2002,2006 -# Free Software Foundation, Inc. +# Copyright (C) 1991-2013 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/libc/mach/Makefile b/libc/mach/Makefile index 00de7a505..08bb3757e 100644 --- a/libc/mach/Makefile +++ b/libc/mach/Makefile @@ -1,5 +1,4 @@ -# Copyright (C) 1991,92,93,94,95,96,97,98,2001,02,12 -# Free Software Foundation, Inc. +# Copyright (C) 1991-2013 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/libc/mach/devstream.c b/libc/mach/devstream.c index 0f515c292..0fc837bf8 100644 --- a/libc/mach/devstream.c +++ b/libc/mach/devstream.c @@ -1,6 +1,6 @@ /* stdio on a Mach device port. Translates \n to \r\n on output, echos and translates \r to \n on input. - Copyright (C) 1992-2012 Free Software Foundation, Inc. + Copyright (C) 1992-2013 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/libc/mach/lock-intern.h b/libc/mach/lock-intern.h index 7c137d9d4..0a5df7aa0 100644 --- a/libc/mach/lock-intern.h +++ b/libc/mach/lock-intern.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1994, 1996, 2007 Free Software Foundation, Inc. +/* Copyright (C) 1994-2013 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/libc/mach/mach.h b/libc/mach/mach.h index 622db97af..cf92171ec 100644 --- a/libc/mach/mach.h +++ b/libc/mach/mach.h @@ -1,5 +1,5 @@ /* Standard header for all Mach programs. - Copyright (C) 1993,94,96,97,2002 Free Software Foundation, Inc. + Copyright (C) 1993-2013 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/libc/mach/mach/mach_traps.h b/libc/mach/mach/mach_traps.h index 29ebbe9ba..8dbda6a25 100644 --- a/libc/mach/mach/mach_traps.h +++ b/libc/mach/mach/mach_traps.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1994,96,97,2002 Free Software Foundation, Inc. +/* Copyright (C) 1994-2013 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/libc/mach/mach/mig_support.h b/libc/mach/mach/mig_support.h index 84838be26..d73eafc9c 100644 --- a/libc/mach/mach/mig_support.h +++ b/libc/mach/mach/mig_support.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1993,94,97,99,2001,2007 Free Software Foundation, Inc. +/* Copyright (C) 1993-2013 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/libc/mach/mach_init.c b/libc/mach/mach_init.c index 6e69f1283..e1ec8eac1 100644 --- a/libc/mach/mach_init.c +++ b/libc/mach/mach_init.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992,93,95,97,2001,02 Free Software Foundation, Inc. +/* Copyright (C) 1992-2013 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/libc/mach/mach_init.h b/libc/mach/mach_init.h index 5b015a638..98540333b 100644 --- a/libc/mach/mach_init.h +++ b/libc/mach/mach_init.h @@ -1,5 +1,5 @@ /* Declarations and macros for the basic Mach things set at startup. - Copyright (C) 1993, 1994, 1997 Free Software Foundation, Inc. + Copyright (C) 1993-2013 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/libc/mach/mig-alloc.c b/libc/mach/mig-alloc.c index ec465a1cc..7920345e4 100644 --- a/libc/mach/mig-alloc.c +++ b/libc/mach/mig-alloc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1995, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1992-2013 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/libc/mach/mig-dealloc.c b/libc/mach/mig-dealloc.c index 635db5ab7..1a3f74e6e 100644 --- a/libc/mach/mig-dealloc.c +++ b/libc/mach/mig-dealloc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1995, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1992-2013 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/libc/mach/mig-reply.c b/libc/mach/mig-reply.c index 3bfd9c16f..c2898ece3 100644 --- a/libc/mach/mig-reply.c +++ b/libc/mach/mig-reply.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1992-2013 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/libc/mach/msgserver.c b/libc/mach/msgserver.c index 915a08868..fc34d7196 100644 --- a/libc/mach/msgserver.c +++ b/libc/mach/msgserver.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993,94,95,96,2001,02 Free Software Foundation, Inc. +/* Copyright (C) 1993-2013 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/libc/mach/mutex-init.c b/libc/mach/mutex-init.c index 46ec114f7..d5010334c 100644 --- a/libc/mach/mutex-init.c +++ b/libc/mach/mutex-init.c @@ -1,5 +1,5 @@ /* Initialize a cthreads mutex structure. - Copyright (C) 1995, 1997 Free Software Foundation, Inc. + Copyright (C) 1995-2013 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/libc/mach/mutex-solid.c b/libc/mach/mutex-solid.c index 025b3914e..61a09ef97 100644 --- a/libc/mach/mutex-solid.c +++ b/libc/mach/mutex-solid.c @@ -1,5 +1,5 @@ /* Stub versions of mutex_lock_solid/mutex_unlock_solid for no -lthreads. - Copyright (C) 1995, 1997 Free Software Foundation, Inc. + Copyright (C) 1995-2013 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/libc/mach/setup-thread.c b/libc/mach/setup-thread.c index 7d104ab05..e1582d193 100644 --- a/libc/mach/setup-thread.c +++ b/libc/mach/setup-thread.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,94,1995,1997,2002,2005 Free Software Foundation, Inc. +/* Copyright (C) 1991-2013 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/libc/mach/spin-lock.h b/libc/mach/spin-lock.h index 624ee275b..6fb07c508 100644 --- a/libc/mach/spin-lock.h +++ b/libc/mach/spin-lock.h @@ -1,5 +1,5 @@ /* Definitions of user-visible names for spin locks. - Copyright (C) 1994, 1997 Free Software Foundation, Inc. + Copyright (C) 1994-2013 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/libc/mach/spin-solid.c b/libc/mach/spin-solid.c index 0bd0a5035..9a3326bda 100644 --- a/libc/mach/spin-solid.c +++ b/libc/mach/spin-solid.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994, 1995, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1994-2013 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 -- cgit v1.2.3