diff options
| author | Zack Weinberg <zackw@panix.com> | 2017-03-25 11:24:24 -0400 |
|---|---|---|
| committer | Zack Weinberg <zackw@panix.com> | 2017-04-07 07:53:03 -0400 |
| commit | 10a33cf8b403e3c031c5dd10a06b4a2a6489e48c (patch) | |
| tree | dd0fe2c58f8a61cb33ee60fffd287f609745ac7a /posix/unistd.h | |
| parent | 0f3be8721a86299600eae2d266934f661bf7c990 (diff) | |
| download | glibc-10a33cf8b403e3c031c5dd10a06b4a2a6489e48c.zip glibc-10a33cf8b403e3c031c5dd10a06b4a2a6489e48c.tar.gz glibc-10a33cf8b403e3c031c5dd10a06b4a2a6489e48c.tar.bz2 | |
getopt: eliminate __need_getopt by splitting up getopt.h.
__need_getopt is misnamed; what it really means is "we want only the
getopt features specified in POSIX, not the GNU extensions". Because
this code is shared with gnulib, it winds up being cleanest to split
getopt.h into *four* headers. getopt_core.h and getopt_ext.h will
be shared with gnulib, getopt_posix.h will be just for glibc, and
each project will have its own copy of getopt.h.
* posix/bits/getopt_core.h, posix/bits/getopt_ext.h:
New files, intended to be shared with gnulib.
* posix/bits/getopt_posix.h:
New file, not intended to be shared with gnulib.
* posix/getopt.h: Now just includes features.h,
bits/getopt_core.h, and bits/getopt_ext.h. Will
no longer be shared with gnulib.
* include/bits/getopt_core.h, include/bits/getopt_ext.h
* include/bits/getopt_posix.h: New wrappers.
* posix/Makefile: Install new headers.
* posix/unistd.h, libio/stdio.h:
Include bits/getopt_posix.h instead of getopt.h.
Diffstat (limited to 'posix/unistd.h')
| -rw-r--r-- | posix/unistd.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/posix/unistd.h b/posix/unistd.h index fa2492e..32b0f48 100644 --- a/posix/unistd.h +++ b/posix/unistd.h @@ -869,8 +869,7 @@ extern int setlogin (const char *__name) __THROW __nonnull ((1)); /* Get definitions and prototypes for functions to process the arguments in ARGV (ARGC of them, minus the program name) for options given in OPTS. */ -# define __need_getopt -# include <getopt.h> +# include <bits/getopt_posix.h> #endif |