diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-29 17:52:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-29 17:52:34 -0800 |
| commit | ec3f7d5d0f3676aa9634ee30f8c9e55893a8c505 (patch) | |
| tree | b51c8a2a902b671d0336a61276c0ae8f9b423836 /git-compat-util.h | |
| parent | 1aa6583cc257f3b0570cbc25c89a54f0e4417ef6 (diff) | |
| parent | 25fe66f84cea9c2e0a7f6b53180542784b94485a (diff) | |
| download | git-ec3f7d5d0f3676aa9634ee30f8c9e55893a8c505.tar.gz | |
Merge branch 'md/interix'
* md/interix:
Interix: add configure checks
add support for the SUA layer (interix; windows)
Conflicts:
git-compat-util.h
Diffstat (limited to 'git-compat-util.h')
| -rw-r--r-- | git-compat-util.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index d0a1e480b6..490f969744 100644 --- 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> |