Fix Windows-specific macro redefinition warning.

shell.c defines macro HELP_COMMAND which collides with a like-named
macro from winuser.h. Avoid collision by sanitizing preprocessor
namespace after including Windows headers.

Acked-by: Johannes Schindelin <redacted>
Acked-by: Johannes Sixt <redacted>
Signed-off-by: Eric Sunshine <redacted>
Signed-off-by: Pat Thoyts <redacted>

diff --git a/compat/mingw.h b/compat/mingw.h
index 47839663be4d1e861c90b0228b89385004dd5fb4..a2213b39118f6ee24f94446891c6b43035744c68 100644 (file)
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -78,6 +78,12 @@ struct itimerval {
 };
 #define ITIMER_REAL 0
 
+/*
+ * sanitize preprocessor namespace polluted by Windows headers defining
+ * macros which collide with git local versions
+ */
+#undef HELP_COMMAND /* from winuser.h */
+
 /*
  * trivial stubs
  */