Merge branch 'md/interix'

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

Conflicts:
	git-compat-util.h

diff --cc Makefile
Simple merge

diff --cc daemon.c
Simple merge

diff --cc git-compat-util.h
index d0a1e480b6445a6f5ba3680672c255ab44ca43f0,625b2e4f142fcd756f80c20fd22c03c15f1b9214..490f96974417b00cd98de046ab1d6853425c3335
--- 1/git-compat-util.h
--- 2/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>