From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 7 Jun 2015 15:36:25 +0000 (+0300)
Subject: Adapt 'struct timespec' to next release of MinGW runtime
X-Git-Tag: emacs-25.0.90~1835
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aa83b5ecb049ebf7491f63d30eac27c983d9bc34;p=emacs.git

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.
---

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);
    elsewhere, but we don't use lib/time.h where the structure is
    defined.  */
 /* MinGW64 defines 'struct timespec' and _TIMESPEC_DEFINED in sys/types.h.  */
-#ifndef _TIMESPEC_DEFINED
+/* Mingw.org's MinGW runtime versions 3.22 and upward define 'struct
+   timespec' and __struct_timespec_defined in parts/time.h, which is
+   included by time.h.  */
+#if !defined (_TIMESPEC_DEFINED) && !defined (__struct_timespec_defined)
 struct timespec
 {
   time_t	tv_sec;		/* seconds */