Merge branch 'sb/submodule-update-in-c'

diff --git a/git-compat-util.h b/git-compat-util.h
index 9a64998b24b1de277772f1ac97a989aae3133898..5f2e90932f9990419d75d803d9552acf2f14adef 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -220,7 +220,7 @@
 #endif
 #ifdef NO_INTPTR_T
 /*
- * On I16LP32, ILP32 and LP64 "long" is the save bet, however
+ * On I16LP32, ILP32 and LP64 "long" is the safe bet, however
  * on LLP86, IL33LLP64 and P64 it needs to be "long long",
  * while on IP16 and IP16L32 it is "int" (resp. "short")
  * Size needs to match (or exceed) 'sizeof(void *)'.
@@ -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