# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1358380132 28800
# Node ID 40135b67c0bea9795c4bd0baaf10f6a58e1630e9
# Parent  44c34bc536ac9d73407b61a177adc4a9dfb1348f
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 -r 44c34bc536ac -r 40135b67c0be ChangeLog
--- a/ChangeLog	Wed Jan 16 09:38:28 2013 -0800
+++ b/ChangeLog	Wed Jan 16 15:48:52 2013 -0800
@@ -1,5 +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>.
+
 	largefile: port better to Mac OS X 10.5
 	This patch is backported from Autoconf git.
 	* m4/largefile.m4 (AC_SYS_LARGEFILE): Use AC_DEFINE, not
diff -r 44c34bc536ac -r 40135b67c0be lib/unistd.in.h
--- a/lib/unistd.in.h	Wed Jan 16 09:38:28 2013 -0800
+++ b/lib/unistd.in.h	Wed Jan 16 15:48:52 2013 -0800
@@ -14,29 +14,13 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
+#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@