# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1360601084 18000
# Node ID 36ae40a11dd574ebee3d2dad3b87d10fc9d3c4db
# Parent  7ebb2c82d76fcf8b572ace5a9037d828757a2d6d
unistd: port to recent mingw

* lib/unistd.in.h: Remove special invocation convention for mingw,
which breaks for the latest mingw version.  See John W. Eaton in
<http://lists.gnu.org/archive/html/bug-gnulib/2013-01/msg00100.html>.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-01-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	unistd: port to recent mingw
+	* lib/unistd.in.h: Remove special invocation convention for mingw,
+	which breaks for the latest mingw version.  See John W. Eaton in
+	<http://lists.gnu.org/archive/html/bug-gnulib/2013-01/msg00100.html>.
+
 2012-03-29  Eric Blake  <eblake@redhat.com>
 
 	stdio: don't assume gets any more
diff --git a/lib/unistd.in.h b/lib/unistd.in.h
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -15,29 +15,13 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
+#ifndef _@GUARD_PREFIX@_UNISTD_H
+
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
 @PRAGMA_COLUMNS@
 
-/* Special invocation convention:
-   - On mingw, several headers, including <winsock2.h>, include <unistd.h>,
-     but we need to ensure that both the system <unistd.h> and <winsock2.h>
-     are completely included before we replace gethostname.  */
-#if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \
-  && !defined _GL_WINSOCK2_H_WITNESS && defined _WINSOCK2_H
-/* <unistd.h> is being indirectly included for the first time from
-   <winsock2.h>; avoid declaring any overrides.  */
-# if @HAVE_UNISTD_H@
-#  @INCLUDE_NEXT@ @NEXT_UNISTD_H@
-# else
-#  error unexpected; report this to bug-gnulib@gnu.org
-# endif
-# define _GL_WINSOCK2_H_WITNESS
-
-/* Normal invocation.  */
-#elif !defined _@GUARD_PREFIX@_UNISTD_H
-
 /* The include_next requires a split double-inclusion guard.  */
 #if @HAVE_UNISTD_H@
 # @INCLUDE_NEXT@ @NEXT_UNISTD_H@