From e79ef192e2da2bf31f0f0655b9c4cb7481c561e9 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 24 Aug 2015 15:46:14 +0000 Subject: [PATCH] Avoid redefinitions with modern MinGW headers Signed-off-by: Johannes Schindelin --- compat/mingw.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compat/mingw.h b/compat/mingw.h index eaaf38f..794fc6d 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -13,12 +13,14 @@ typedef int pid_t; #define S_IFLNK 0120000 /* Symbolic link */ #define S_ISLNK(x) (((x) & S_IFMT) == S_IFLNK) #define S_ISSOCK(x) 0 +#ifndef __MINGW64_VERSION_MAJOR #define S_IRGRP 0 #define S_IWGRP 0 #define S_IXGRP 0 #define S_ISGID 0 #define S_IROTH 0 #define S_IXOTH 0 +#endif #define WIFEXITED(x) ((unsigned)(x) < 259) /* STILL_ACTIVE */ #define WEXITSTATUS(x) ((x) & 0xff) -- 2.11.4.GIT