Mercurial > gnulib
changeset 17675:36ae40a11dd5 octave-stable
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>.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Mon, 11 Feb 2013 11:44:44 -0500 |
parents | 7ebb2c82d76f |
children | 0eef0a2a05e2 |
files | ChangeLog lib/unistd.in.h |
diffstat | 2 files changed, 9 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Mar 29 13:30:41 2012 -0600 +++ b/ChangeLog Mon Feb 11 11:44:44 2013 -0500 @@ -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
--- a/lib/unistd.in.h Thu Mar 29 13:30:41 2012 -0600 +++ b/lib/unistd.in.h Mon Feb 11 11:44:44 2013 -0500 @@ -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@