diffcore-rename: properly honor the difference between -M and -C

diff --git a/git-compat-util.h b/git-compat-util.h
index d0a1e480b6445a6f5ba3680672c255ab44ca43f0..d6d269f138b06791ba6e8712b06036f00a73c7e3 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -105,7 +105,11 @@
 #include <regex.h>
 #include <utime.h>
 #include <syslog.h>
+#ifndef NO_SYS_POLL_H
 #include <sys/poll.h>
+#else
+#include <poll.h>
+#endif
 #ifndef __MINGW32__
 #include <sys/wait.h>
 #include <sys/socket.h>
@@ -119,7 +123,11 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <pwd.h>
+#ifndef NO_INTTYPES_H
 #include <inttypes.h>
+#else
+#include <stdint.h>
+#endif
 #if defined(__CYGWIN__)
 #undef _XOPEN_SOURCE
 #include <grp.h>
@@ -413,6 +421,7 @@ extern ssize_t xwrite(int fd, const void *buf, size_t len);
 extern int xdup(int fd);
 extern FILE *xfdopen(int fd, const char *mode);
 extern int xmkstemp(char *template);
+extern int xmkstemp_mode(char *template, int mode);
 extern int odb_mkstemp(char *template, size_t limit, const char *pattern);
 extern int odb_pack_keep(char *name, size_t namesz, unsigned char *sha1);