From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 30 Nov 2010 01:52:34 +0000 (-0800)
Subject: Merge branch 'md/interix'
X-Git-Tag: v1.7.4-rc0~105
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ec3f7d5d0f3676aa9634ee30f8c9e55893a8c505;p=git.git

Merge branch 'md/interix'

* md/interix:
  Interix: add configure checks
  add support for the SUA layer (interix; windows)

Conflicts:
	git-compat-util.h
---

ec3f7d5d0f3676aa9634ee30f8c9e55893a8c505
diff --cc git-compat-util.h
index d0a1e480b,625b2e4f1..490f96974
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@@ -104,10 -104,13 +104,14 @@@
  #include <assert.h>
  #include <regex.h>
  #include <utime.h>
 -#ifndef __MINGW32__
 -#include <sys/wait.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>
  #include <sys/ioctl.h>
  #include <termios.h>