diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-22 10:25:04 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-22 10:27:46 -0700 |
| commit | bd78ca3d3d7b5ec2679af1ea3d23e278c81e01d8 (patch) | |
| tree | 886f062c486e951fbe367cc9ce485f7009cef93c /lib/getopt_int.h | |
| parent | 6afba02d7869d39ed7f61981045ddbdcb2814101 (diff) | |
| download | gnulib-bd78ca3d3d7b5ec2679af1ea3d23e278c81e01d8.tar.gz | |
getopt: merge from glibc
This does not change anything substantial; it merely simplifies
hypothetical merges back to glibc.
* lib/getopt.c, lib/getopt.in.h, lib/getopt1.c, lib/getopt_int.h:
Change copyright notice to match what is in glibc.
* lib/getopt.c: Reorder includes to match glibc. Remove uses of
USE_IN_LIBIO. Remove 'register'. In __LIBC code, use
__open_memstream rather than open_memstream and __glibc_likely
instead of __builtin_expect.
* lib/getopt.in.h (__posix_getopt) [!__GETOPT_PREFIX]: New decl.
Diffstat (limited to 'lib/getopt_int.h')
| -rw-r--r-- | lib/getopt_int.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/getopt_int.h b/lib/getopt_int.h index a7ce0e9cc1..2786798ac9 100644 --- a/lib/getopt_int.h +++ b/lib/getopt_int.h @@ -1,20 +1,20 @@ /* Internal declarations for getopt. - Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2017 Free Software - Foundation, Inc. + Copyright (C) 1989-2017 Free Software Foundation, Inc. This file is part of the GNU C Library. - 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 - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + The GNU C Library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ #ifndef _GETOPT_INT_H #define _GETOPT_INT_H 1 |