Merge branch 'es/want-color-fd-defensive'

diff --git a/git-compat-util.h b/git-compat-util.h
index 9a64998b24b1de277772f1ac97a989aae3133898..89d37095c75775a6471b0188097a58a8d1440cb1 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -1239,4 +1239,10 @@ extern void unleak_memory(const void *ptr, size_t len);
 #define UNLEAK(var) do {} while (0)
 #endif
 
+/*
+ * This include must come after system headers, since it introduces macros that
+ * replace system names.
+ */
+#include "banned.h"
+
 #endif