From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Nov 2010 22:44:20 +0000 (-0800)
Subject: Merge branch 'ef/mingw-daemon' into next
X-Git-Tag: ko-next~131
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4a295c76d329d1483519e30678d4805636170b70;p=git.git

Merge branch 'ef/mingw-daemon' into next

* ef/mingw-daemon:
  daemon: opt-out on features that require posix
  daemon: make --inetd and --detach incompatible
  daemon: use socklen_t
  mingw: use poll-emulation from gnulib
  mingw: import poll-emulation from gnulib
  daemon: get remote host address from root-process
  Improve the mingw getaddrinfo stub to handle more use cases
  daemon: use full buffered mode for stderr
  daemon: use run-command api for async serving
  mingw: add kill emulation
  mingw: support waitpid with pid > 0 and WNOHANG
  mingw: use real pid
  inet_ntop: fix a couple of old-style decls
  compat: add inet_pton and inet_ntop prototypes
  mingw: implement syslog
  mingw: add network-wrappers for daemon

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

4a295c76d329d1483519e30678d4805636170b70
diff --cc git-compat-util.h
index 625b2e4f1,d0a1e480b..490f96974
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@@ -104,13 -104,10 +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>