Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
mingw: avoid redefining S_* constants
author
Johannes Schindelin
<johannes.schindelin@gmx.de>
Fri, 15 Jan 2016 13:24:29 +0000
(14:24 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 15 Jan 2016 22:01:10 +0000
(14:01 -0800)
When compiling with MSys2's compiler, these constants are already defined.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
compat/mingw.h
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
466931d
)
diff --git
a/compat/mingw.h
b/compat/mingw.h
index 10e2e4cacb75c34bfdc78bede36132c5498af811..093a9771bea2230dddba3fa37b0be3d1e4cac335 100644
(file)
--- 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