summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorEric Sunshine <sunshine@sunshineco.com>2010-09-27 11:01:59 (GMT)
committerPat Thoyts <patthoyts@users.sourceforge.net>2010-10-03 22:34:24 (GMT)
commit77df1f1edfab61bf605f707aeb3b5f5bd54ffb76 (patch)
treefd1c9b069ee19266b588b593c4df6b2aeeaeebfb /compat
parentb248e950966769f5f981321ea9d12f2b238c978c (diff)
downloadgit-77df1f1edfab61bf605f707aeb3b5f5bd54ffb76.zip
git-77df1f1edfab61bf605f707aeb3b5f5bd54ffb76.tar.gz
git-77df1f1edfab61bf605f707aeb3b5f5bd54ffb76.tar.bz2
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>
Diffstat (limited to 'compat')
-rw-r--r--compat/mingw.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/compat/mingw.h b/compat/mingw.h
index 4783966..a2213b3 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -79,6 +79,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
*/