aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2015-06-07 18:36:25 +0300
committerEli Zaretskii2015-06-07 18:36:25 +0300
commitaa83b5ecb049ebf7491f63d30eac27c983d9bc34 (patch)
treed3272d58ef0c0d3d2aa58846808f8b1ee179403f
parent4b7c816e044b52e586d54482ac29ab41e91f56f1 (diff)
downloademacs-aa83b5ecb049ebf7491f63d30eac27c983d9bc34.tar.gz
emacs-aa83b5ecb049ebf7491f63d30eac27c983d9bc34.zip
Adapt 'struct timespec' to next release of MinGW runtime
* nt/inc/ms-w32.h (struct timespec): Don't declare if __struct_timespec_defined is defined.
-rw-r--r--nt/inc/ms-w32.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index da772906ddc..bfa5bb5e149 100644
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -310,7 +310,10 @@ int _getpid (void);
310 elsewhere, but we don't use lib/time.h where the structure is 310 elsewhere, but we don't use lib/time.h where the structure is
311 defined. */ 311 defined. */
312/* MinGW64 defines 'struct timespec' and _TIMESPEC_DEFINED in sys/types.h. */ 312/* MinGW64 defines 'struct timespec' and _TIMESPEC_DEFINED in sys/types.h. */
313#ifndef _TIMESPEC_DEFINED 313/* Mingw.org's MinGW runtime versions 3.22 and upward define 'struct
314 timespec' and __struct_timespec_defined in parts/time.h, which is
315 included by time.h. */
316#if !defined (_TIMESPEC_DEFINED) && !defined (__struct_timespec_defined)
314struct timespec 317struct timespec
315{ 318{
316 time_t tv_sec; /* seconds */ 319 time_t tv_sec; /* seconds */