From: Eric Sunshine <sunshine@sunshineco.com>
Date: Mon, 27 Sep 2010 11:01:59 +0000 (-0400)
Subject: Fix Windows-specific macro redefinition warning.
X-Git-Tag: v1.7.4-rc0~193^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=77df1f1edfab61bf605f707aeb3b5f5bd54ffb76;p=git.git

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 <johannes.schindelin@gmx.de>
Acked-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
---

diff --git a/compat/mingw.h b/compat/mingw.h
index 47839663b..a2213b391 100644
--- 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
  */