From cd9ca871b093a264f24702d5e821a5439ea229be Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Fri, 31 May 2013 18:08:25 +0000
Subject: [PATCH] 	* include/sys/socket.h: Move SHUT_xx definitoins from
 here... 	* include/cygwin/socket.h: ...to here.

---
 winsup/cygwin/ChangeLog               | 5 +++++
 winsup/cygwin/include/cygwin/socket.h | 9 +++++++--
 winsup/cygwin/include/sys/socket.h    | 9 ++-------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 0897d5fe0..da887a61c 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-31  Corinna Vinschen  <corinna@vinschen.de>
+
+	* include/sys/socket.h: Move SHUT_xx definitoins from here...
+	* include/cygwin/socket.h: ...to here.
+
 2013-05-31  Corinna Vinschen  <corinna@vinschen.de>
 
 	* include/cygwin/if.h: Include cygwin/socket.h rather than sys/socket.h
diff --git a/winsup/cygwin/include/cygwin/socket.h b/winsup/cygwin/include/cygwin/socket.h
index aed729a73..5ed83bef9 100644
--- a/winsup/cygwin/include/cygwin/socket.h
+++ b/winsup/cygwin/include/cygwin/socket.h
@@ -1,7 +1,7 @@
 /* cygwin/socket.h
 
-   Copyright 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2009, 2010, 2012
-   Red Hat, Inc.
+   Copyright 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2009, 2010, 2012,
+   2013 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -302,6 +302,11 @@ struct OLD_msghdr
 #define TCP_MAXSEG	2
 #endif
 
+/* SUS symbolic values for the second parm to shutdown(2) */
+#define SHUT_RD   0		/* == Win32 SD_RECEIVE */
+#define SHUT_WR   1		/* == Win32 SD_SEND    */
+#define SHUT_RDWR 2		/* == Win32 SD_BOTH    */
+
 /* The various priorities. */
 #define SOPRI_INTERACTIVE	0
 #define SOPRI_NORMAL		1
diff --git a/winsup/cygwin/include/sys/socket.h b/winsup/cygwin/include/sys/socket.h
index 8a16be822..2d66abb26 100644
--- a/winsup/cygwin/include/sys/socket.h
+++ b/winsup/cygwin/include/sys/socket.h
@@ -1,7 +1,7 @@
 /* sys/socket.h
 
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2005, 2006, 2009, 2010
-   Red Hat, Inc.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2005, 2006, 2009, 2010,
+   2013 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -21,11 +21,6 @@ extern "C"
 {
 #endif
 
-/* SUS symbolic values for the second parm to shutdown(2) */
-#define SHUT_RD   0		/* == Win32 SD_RECEIVE */
-#define SHUT_WR   1		/* == Win32 SD_SEND    */
-#define SHUT_RDWR 2		/* == Win32 SD_BOTH    */
-
 #ifndef __INSIDE_CYGWIN_NET__
   int accept (int, struct sockaddr *__peer, socklen_t *);
   int accept4 (int, struct sockaddr *__peer, socklen_t *, int flags);