From 59de49f80d8f6067f19496750cc79632b2959ad9 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 15 Jan 2016 14:24:29 +0100 Subject: [PATCH] mingw: avoid redefining S_* constants When compiling with MSys2's compiler, these constants are already defined. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- compat/mingw.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/compat/mingw.h b/compat/mingw.h index 10e2e4cacb..093a9771be 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -26,14 +26,18 @@ typedef int pid_t; #define S_ISLNK(x) (((x) & S_IFMT) == S_IFLNK) #define S_ISSOCK(x) 0 +#ifndef S_IRWXG #define S_IRGRP 0 #define S_IWGRP 0 #define S_IXGRP 0 #define S_IRWXG (S_IRGRP | S_IWGRP | S_IXGRP) +#endif +#ifndef S_IRWXO #define S_IROTH 0 #define S_IWOTH 0 #define S_IXOTH 0 #define S_IRWXO (S_IROTH | S_IWOTH | S_IXOTH) +#endif #define S_ISUID 0004000 #define S_ISGID 0002000 -- 2.11.4.GIT