From aa83b5ecb049ebf7491f63d30eac27c983d9bc34 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 7 Jun 2015 18:36:25 +0300 Subject: [PATCH] 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 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h index da772906dd..bfa5bb5e14 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 */ -- 2.39.2