diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-04-09 00:53:27 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-04-09 00:55:23 -0700 |
| commit | 43bc45ba1697b60c4589cb0c8e30cf1618275582 (patch) | |
| tree | 1cfb5d5e35c0543dfaddc60d63171dc128f4b6ee /lib/unistd.in.h | |
| parent | 440bafef7cce6044d4f9d6ca3c3e0856ee9732b7 (diff) | |
| download | emacs-43bc45ba1697b60c4589cb0c8e30cf1618275582.tar.gz emacs-43bc45ba1697b60c4589cb0c8e30cf1618275582.tar.bz2 emacs-43bc45ba1697b60c4589cb0c8e30cf1618275582.zip | |
Merge from gnulib (Bug#26398)
This incorporates:
2017-04-08 getopt: prefer - to _ in new file names
2017-04-08 getopt: port recent getopt changes to macOS
* .gitignore: Add lib/getopt-cdefs.h.
* lib/getopt-cdefs.in.h: Rename from lib/getopt_cdefs.in.h.
* lib/getopt-core.h: Rename from lib/getopt_core.h.
* lib/getopt-ext.h: Rename from lib/getopt_ext.h.
* lib/getopt-pfx-core.h: Rename from lib/getopt_pfx_core.h.
* lib/getopt-pfx-ext.h: Rename from lib/getopt_pfx_ext.h.
* lib/getopt.in.h, lib/unistd.in.h, m4/getopt.m4:
Copy from Gnulib.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
Diffstat (limited to 'lib/unistd.in.h')
| -rw-r--r-- | lib/unistd.in.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/unistd.in.h b/lib/unistd.in.h index ed175bf8f2b..cb9321e502d 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -127,11 +127,18 @@ # include <sys/types.h> #endif +/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ + +/* The definition of _GL_ARG_NONNULL is copied here. */ + +/* The definition of _GL_WARN_ON_USE is copied here. */ + + /* Get getopt(), optarg, optind, opterr, optopt. But avoid namespace pollution on glibc systems. */ #if @GNULIB_UNISTD_H_GETOPT@ && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT -# include <getopt_cdefs.h> -# include <getopt_pfx_core.h> +# include <getopt-cdefs.h> +# include <getopt-pfx-core.h> #endif #ifndef _GL_INLINE_HEADER_BEGIN @@ -142,13 +149,6 @@ _GL_INLINE_HEADER_BEGIN # define _GL_UNISTD_INLINE _GL_INLINE #endif -/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ - -/* The definition of _GL_ARG_NONNULL is copied here. */ - -/* The definition of _GL_WARN_ON_USE is copied here. */ - - /* Hide some function declarations from <winsock2.h>. */ #if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ |