projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add git-am, applymbox replacement.
[git.git]
/
connect.c
diff --git
a/connect.c
b/connect.c
index
0e6f27e
..
b157cf1
100644
(file)
--- a/
connect.c
+++ b/
connect.c
@@
-290,7
+290,7
@@
static enum protocol get_protocol(const char *name)
#define STR_(s) # s
#define STR(s) STR_(s)
#define STR_(s) # s
#define STR(s) STR_(s)
-#ifndef
__CYGWIN__
+#ifndef
NO_IPV6
static int git_tcp_connect(int fd[2], const char *prog, char *host, char *path)
{
static int git_tcp_connect(int fd[2], const char *prog, char *host, char *path)
{
@@
-348,7
+348,7
@@
static int git_tcp_connect(int fd[2], const char *prog, char *host, char *path)
return 0;
}
return 0;
}
-#else /*
__CYGWIN__
*/
+#else /*
NO_IPV6
*/
static int git_tcp_connect(int fd[2], const char *prog, char *host, char *path)
{
static int git_tcp_connect(int fd[2], const char *prog, char *host, char *path)
{
@@
-397,7
+397,7
@@
static int git_tcp_connect(int fd[2], const char *prog, char *host, char *path)
memset(&sa, 0, sizeof sa);
sa.sin_family = he->h_addrtype;
memset(&sa, 0, sizeof sa);
sa.sin_family = he->h_addrtype;
- sa.sin_port =
nport
;
+ sa.sin_port =
htons(nport)
;
memcpy(&sa.sin_addr, ap, he->h_length);
if (connect(sockfd, (struct sockaddr *)&sa, sizeof sa) < 0) {
memcpy(&sa.sin_addr, ap, he->h_length);
if (connect(sockfd, (struct sockaddr *)&sa, sizeof sa) < 0) {
@@
-417,7
+417,7
@@
static int git_tcp_connect(int fd[2], const char *prog, char *host, char *path)
return 0;
}
return 0;
}
-#endif /*
__CYGWIN__
*/
+#endif /*
NO_IPV6
*/
/*
* Yeah, yeah, fixme. Need to pass in the heads etc.
/*
* Yeah, yeah, fixme. Need to pass in the heads etc.