Mercurial > mxe-octave
comparison src/stable-octave-1-fixes.patch @ 2941:8f0c44add205
rename octave-stable to stable-octave to avoid conflict with patch file
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 04 Jan 2013 14:48:15 -0500 |
| parents | src/octave-stable-1-fixes.patch@30a5052213e6 |
| children |
comparison
equal
deleted
inserted
replaced
| 2940:fa2beb4c25a5 | 2941:8f0c44add205 |
|---|---|
| 1 --- a/libgnu/unistd.in.h 2012-12-03 12:57:36.000000000 -0500 | |
| 2 +++ b/libgnu/unistd.in.h 2012-12-03 14:22:38.421760035 -0500 | |
| 3 @@ -19,23 +19,7 @@ | |
| 4 #endif | |
| 5 @PRAGMA_COLUMNS@ | |
| 6 | |
| 7 -/* Special invocation convention: | |
| 8 - - On mingw, several headers, including <winsock2.h>, include <unistd.h>, | |
| 9 - but we need to ensure that both the system <unistd.h> and <winsock2.h> | |
| 10 - are completely included before we replace gethostname. */ | |
| 11 -#if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \ | |
| 12 - && !defined _GL_WINSOCK2_H_WITNESS && defined _WINSOCK2_H | |
| 13 -/* <unistd.h> is being indirectly included for the first time from | |
| 14 - <winsock2.h>; avoid declaring any overrides. */ | |
| 15 -# if @HAVE_UNISTD_H@ | |
| 16 -# @INCLUDE_NEXT@ @NEXT_UNISTD_H@ | |
| 17 -# else | |
| 18 -# error unexpected; report this to bug-gnulib@gnu.org | |
| 19 -# endif | |
| 20 -# define _GL_WINSOCK2_H_WITNESS | |
| 21 - | |
| 22 -/* Normal invocation. */ | |
| 23 -#elif !defined _@GUARD_PREFIX@_UNISTD_H | |
| 24 +#if !defined _@GUARD_PREFIX@_UNISTD_H | |
| 25 | |
| 26 /* The include_next requires a split double-inclusion guard. */ | |
| 27 #if @HAVE_UNISTD_H@ |