diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2020-03-25 13:39:21 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2020-03-25 13:40:35 -0700 |
| commit | 1060a6401b8ee9aaa4b2056025402e7fa1ad1643 (patch) | |
| tree | a0900d48c4b8c59ea2daeafcbb0900c5e40accfe /lib/getopt-pfx-core.h | |
| parent | 2ea87d6c6f1161801402958bdc6b6a2e6c41c6b8 (diff) | |
| download | emacs-1060a6401b8ee9aaa4b2056025402e7fa1ad1643.tar.gz emacs-1060a6401b8ee9aaa4b2056025402e7fa1ad1643.tar.bz2 emacs-1060a6401b8ee9aaa4b2056025402e7fa1ad1643.zip | |
Update from gnulib
This incorporates:
2020-03-25 getopt-posix: port __GETOPT_PREFIX to macOS
2020-03-22 acl-permissions: Improve autoconf macro
* lib/getopt-pfx-core.h, m4/acl.m4: Copy from Gnulib.
Diffstat (limited to 'lib/getopt-pfx-core.h')
| -rw-r--r-- | lib/getopt-pfx-core.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/getopt-pfx-core.h b/lib/getopt-pfx-core.h index da0a6d0c3c4..ec545c1b51c 100644 --- a/lib/getopt-pfx-core.h +++ b/lib/getopt-pfx-core.h @@ -48,6 +48,14 @@ # define optind __GETOPT_ID (optind) # define optopt __GETOPT_ID (optopt) +/* Work around a a problem on macOS, which declares getopt with a + trailing __DARWIN_ALIAS(getopt) that would expand to something like + __asm("_" "rpl_getopt" "$UNIX2003") were it not for the following + hack to suppress the macOS declaration <https://bugs.gnu.org/40205>. */ +# ifdef __APPLE__ +# define _GETOPT +# endif + /* The system's getopt.h may have already included getopt-core.h to declare the unprefixed identifiers. Undef _GETOPT_CORE_H so that getopt-core.h declares them with prefixes. */ |