Merge branch 'js/mingw-shutdown'

gitster · gitster · commit c3c7797e1d15 · 2011-05-23T10:27:12.000-07:00
* js/mingw-shutdown:
  Windows: add a wrapper for the shutdown() system call
diff --git a/compat/mingw.c b/compat/mingw.c
@@ -1381,6 +1381,13 @@ int mingw_setsockopt(int sockfd, int lvl, int optname, void *optval, int optlen)
 	return setsockopt(s, lvl, optname, (const char*)optval, optlen);
 }
 
+#undef shutdown
+int mingw_shutdown(int sockfd, int how)
+{
+	SOCKET s = (SOCKET)_get_osfhandle(sockfd);
+	return shutdown(s, how);
+}
+
 #undef listen
 int mingw_listen(int sockfd, int backlog)
 {
diff --git a/compat/mingw.h b/compat/mingw.h
@@ -217,6 +217,9 @@ int mingw_bind(int sockfd, struct sockaddr *sa, size_t sz);
 int mingw_setsockopt(int sockfd, int lvl, int optname, void *optval, int optlen);
 #define setsockopt mingw_setsockopt
 
+int mingw_shutdown(int sockfd, int how);
+#define shutdown mingw_shutdown
+
 int mingw_listen(int sockfd, int backlog);
 #define listen mingw_listen
 

Original file line number	Diff line number	Diff line change
`@@ -1381,6 +1381,13 @@ int mingw_setsockopt(int sockfd, int lvl, int optname, void *optval, int optlen)`
`1381`	`1381`	`return setsockopt(s, lvl, optname, (const char*)optval, optlen);`
`1382`	`1382`	`}`
`1383`	`1383`
	`1384`	`+#undef shutdown`
	`1385`	`+int mingw_shutdown(int sockfd, int how)`
	`1386`	`+{`
	`1387`	`+ SOCKET s = (SOCKET)_get_osfhandle(sockfd);`
	`1388`	`+ return shutdown(s, how);`
	`1389`	`+}`
	`1390`	`+`
`1384`	`1391`	`#undef listen`
`1385`	`1392`	`int mingw_listen(int sockfd, int backlog)`
`1386`	`1393`	`{`