Mercurial > mxe-octave
view src/octave-1-fixes.patch @ 2894:8d7005cff4a4 stable
stable octave branch
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 04 Dec 2012 07:49:42 -0500 |
parents | 0d9aa105b49e |
children | 5da5a3cf24db b4e625571bf6 |
line wrap: on
line source
--- a/libgnu/unistd.in.h 2012-05-31 11:24:06.000000000 -0400 +++ a/libgnu/unistd.in.h 2012-12-03 21:16:42.442531641 -0500 @@ -22,23 +22,7 @@ #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 +#if !defined _@GUARD_PREFIX@_UNISTD_H /* The include_next requires a split double-inclusion guard. */ #if @HAVE_UNISTD_H@