X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-compat-util.h;h=490f96974417b00cd98de046ab1d6853425c3335;hb=5eee142c89ee4964c9ea4ae1b2fa8344036a7efb;hp=56dce8588472e8535c1482ed21818f413abb4dbf;hpb=da523cc597b1be7fe61ee870cf93b142e70fab7f;p=git.git

diff --git a/git-compat-util.h b/git-compat-util.h
index 56dce8588..490f96974 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -105,9 +105,13 @@
 #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/poll.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <termios.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>