emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master aa83b5e: Adapt 'struct timespec' to next release of


From: Eli Zaretskii
Subject: [Emacs-diffs] master aa83b5e: Adapt 'struct timespec' to next release of MinGW runtime
Date: Sun, 07 Jun 2015 15:38:00 +0000

branch: master
commit aa83b5ecb049ebf7491f63d30eac27c983d9bc34
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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.
---
 nt/inc/ms-w32.h |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index da77290..bfa5bb5 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 */



reply via email to

[Prev in Thread] Current Thread [Next in Thread]