diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-11-23 16:05:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-23 16:05:46 -0800 |
| commit | 89ba4e7c7f71712133d1d3137f811b99ea43dd31 (patch) | |
| tree | 0a831af2e55f0b533ff80a53972b0b17755e310f /compat/inet_pton.c | |
| parent | Update draft release notes to 1.7.4 (diff) | |
| parent | daemon: opt-out on features that require posix (diff) | |
| download | tgif-89ba4e7c7f71712133d1d3137f811b99ea43dd31.tar.xz | |
Merge branch 'ef/mingw-daemon'
* 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
Diffstat (limited to 'compat/inet_pton.c')
| -rw-r--r-- | compat/inet_pton.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/compat/inet_pton.c b/compat/inet_pton.c index 4078fc0877..2ec995e63d 100644 --- a/compat/inet_pton.c +++ b/compat/inet_pton.c @@ -17,9 +17,9 @@ #include <errno.h> #include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> + +#include "../git-compat-util.h" + #include <stdio.h> #include <string.h> @@ -41,7 +41,9 @@ */ static int inet_pton4(const char *src, unsigned char *dst); +#ifndef NO_IPV6 static int inet_pton6(const char *src, unsigned char *dst); +#endif /* int * inet_pton4(src, dst) |