Mercurial > mxe-octave

annotate src/octave-1-fixes.patch @ 2894:8d7005cff4a4 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stable octave branch
author John W. Eaton <jwe@octave.org>
date Tue, 04 Dec 2012 07:49:42 -0500
parents 0d9aa105b49e
children 5da5a3cf24db b4e625571bf6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2894
8d7005cff4a4 stable octave branch
John W. Eaton <jwe@octave.org>
parents: 2892
diff changeset
1 --- a/libgnu/unistd.in.h 2012-05-31 11:24:06.000000000 -0400
8d7005cff4a4 stable octave branch
John W. Eaton <jwe@octave.org>
parents: 2892
diff changeset
2 +++ a/libgnu/unistd.in.h 2012-12-03 21:16:42.442531641 -0500
8d7005cff4a4 stable octave branch
John W. Eaton <jwe@octave.org>
parents: 2892
diff changeset
3 @@ -22,23 +22,7 @@
2892
0d9aa105b49e Update Octave version. Fix unistd.h problem in gnulib, not Octave.
John W. Eaton <jwe@octave.org>
parents: 2874
diff changeset
4 #endif
0d9aa105b49e Update Octave version. Fix unistd.h problem in gnulib, not Octave.
John W. Eaton <jwe@octave.org>
parents: 2874
diff changeset
5 @PRAGMA_COLUMNS@
2874
890aa60f7b87 Temporary Octave patch file, improve Octave config and build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6
2892
0d9aa105b49e Update Octave version. Fix unistd.h problem in gnulib, not Octave.
John W. Eaton <jwe@octave.org>
parents: 2874
diff changeset
7 -/* Special invocation convention:
0d9aa105b49e Update Octave version. Fix unistd.h problem in gnulib, not Octave.
John W. Eaton <jwe@octave.org>
parents: 2874
diff changeset
8 - - On mingw, several headers, including <winsock2.h>, include <unistd.h>,
0d9aa105b49e Update Octave version. Fix unistd.h problem in gnulib, not Octave.
John W. Eaton <jwe@octave.org>
parents: 2874
diff changeset
9 - but we need to ensure that both the system <unistd.h> and <winsock2.h>
0d9aa105b49e Update Octave version. Fix unistd.h problem in gnulib, not Octave.
John W. Eaton <jwe@octave.org>
parents: 2874
diff changeset
10 - are completely included before we replace gethostname. */
0d9aa105b49e Update Octave version. Fix unistd.h problem in gnulib, not Octave.
John W. Eaton <jwe@octave.org>
parents: 2874
diff changeset
11 -#if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \
0d9aa105b49e Update Octave version. Fix unistd.h problem in gnulib, not Octave.
John W. Eaton <jwe@octave.org>
parents: 2874
diff changeset
12 - && !defined _GL_WINSOCK2_H_WITNESS && defined _WINSOCK2_H
0d9aa105b49e Update Octave version. Fix unistd.h problem in gnulib, not Octave.
John W. Eaton <jwe@octave.org>
parents: 2874
diff changeset
13 -/* <unistd.h> is being indirectly included for the first time from
0d9aa105b49e Update Octave version. Fix unistd.h problem in gnulib, not Octave.
John W. Eaton <jwe@octave.org>
parents: 2874
diff changeset
14 - <winsock2.h>; avoid declaring any overrides. */
0d9aa105b49e Update Octave version. Fix unistd.h problem in gnulib, not Octave.
John W. Eaton <jwe@octave.org>
parents: 2874
diff changeset
15 -# if @HAVE_UNISTD_H@
0d9aa105b49e Update Octave version. Fix unistd.h problem in gnulib, not Octave.
John W. Eaton <jwe@octave.org>
parents: 2874
diff changeset
16 -# @INCLUDE_NEXT@ @NEXT_UNISTD_H@
0d9aa105b49e Update Octave version. Fix unistd.h problem in gnulib, not Octave.
John W. Eaton <jwe@octave.org>
parents: 2874
diff changeset
17 -# else
0d9aa105b49e Update Octave version. Fix unistd.h problem in gnulib, not Octave.
John W. Eaton <jwe@octave.org>
parents: 2874
diff changeset
18 -# error unexpected; report this to bug-gnulib@gnu.org
0d9aa105b49e Update Octave version. Fix unistd.h problem in gnulib, not Octave.
John W. Eaton <jwe@octave.org>
parents: 2874
diff changeset
19 -# endif
0d9aa105b49e Update Octave version. Fix unistd.h problem in gnulib, not Octave.
John W. Eaton <jwe@octave.org>
parents: 2874
diff changeset
20 -# define _GL_WINSOCK2_H_WITNESS
0d9aa105b49e Update Octave version. Fix unistd.h problem in gnulib, not Octave.
John W. Eaton <jwe@octave.org>
parents: 2874
diff changeset
21 -
0d9aa105b49e Update Octave version. Fix unistd.h problem in gnulib, not Octave.
John W. Eaton <jwe@octave.org>
parents: 2874
diff changeset
22 -/* Normal invocation. */
0d9aa105b49e Update Octave version. Fix unistd.h problem in gnulib, not Octave.
John W. Eaton <jwe@octave.org>
parents: 2874
diff changeset
23 -#elif !defined _@GUARD_PREFIX@_UNISTD_H
0d9aa105b49e Update Octave version. Fix unistd.h problem in gnulib, not Octave.
John W. Eaton <jwe@octave.org>
parents: 2874
diff changeset
24 +#if !defined _@GUARD_PREFIX@_UNISTD_H
2874
890aa60f7b87 Temporary Octave patch file, improve Octave config and build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25
2892
0d9aa105b49e Update Octave version. Fix unistd.h problem in gnulib, not Octave.
John W. Eaton <jwe@octave.org>
parents: 2874
diff changeset
26 /* The include_next requires a split double-inclusion guard. */
0d9aa105b49e Update Octave version. Fix unistd.h problem in gnulib, not Octave.
John W. Eaton <jwe@octave.org>
parents: 2874
diff changeset
27 #if @HAVE_UNISTD_H@