Merge branch 'master' into next

diff --git a/xdiff/xinclude.h b/xdiff/xinclude.h
index 9490fc56ca7523120ad315c2f64149c61ca4c269..04a9da82c9cb7a2ab24d86efb0e6c6aafdd55f3b 100644 (file)
--- a/xdiff/xinclude.h
+++ b/xdiff/xinclude.h
@@ -23,6 +23,7 @@
 #if !defined(XINCLUDE_H)
 #define XINCLUDE_H
 
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>