diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-05-14 01:29:05 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-05-14 01:29:29 -0700 |
| commit | 4132bd74e9816ca913f862835cc062e092ab8b79 (patch) | |
| tree | 7861e23ef6007320ca0417a147656cf9774473b7 /lib/getopt.c | |
| parent | 9a5e864de731e113badbe300b1e4174f103547fa (diff) | |
| download | emacs-4132bd74e9816ca913f862835cc062e092ab8b79.tar.gz | |
Merge from gnulib
This incorporates:
2017-05-13 largefile: Simplify
2017-05-13 largefile: Improve and document
2017-05-13 truncate: New module
2017-05-13 windows-stat-timespec: New module
2017-05-13 windows-stat-override: New module
2017-05-11 getopt-posix: port to mingw
2017-05-11 gettimeofday: Increase precision on mingw
2017-05-10 time: Fix missing initialization of HAVE_TIMEZONE_T
2017-05-10 Implement a way to opt out from MSVC support
2017-05-09 tzset: Expand comment about TZ problem on native Windows
* build-aux/config.guess, lib/dup2.c, lib/fcntl.c, lib/fsync.c:
* lib/getdtablesize.c, lib/getopt.c, lib/gettimeofday.c:
* lib/mktime.c, lib/stat-time.h, lib/sys_stat.in.h, lib/unistd.in.h:
* lib/utimens.c, m4/gettimeofday.m4, m4/largefile.m4:
* m4/sys_stat_h.m4, m4/sys_time_h.m4, m4/time_h.m4, m4/time_rz.m4:
* m4/unistd_h.m4: Copy from gnulib.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
Diffstat (limited to 'lib/getopt.c')
| -rw-r--r-- | lib/getopt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/getopt.c b/lib/getopt.c index a7db39b68df..9a2867db277 100644 --- a/lib/getopt.c +++ b/lib/getopt.c @@ -45,7 +45,8 @@ # define _(msgid) gettext (msgid) /* When used standalone, flockfile and funlockfile might not be available. */ -# ifndef _POSIX_THREAD_SAFE_FUNCTIONS +# if (!defined _POSIX_THREAD_SAFE_FUNCTIONS \ + || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) # define flockfile(fp) /* nop */ # define funlockfile(fp) /* nop */ # endif |