Mercurial > mxe-octave
annotate src/octave-1-gnulib-isatty.patch @ 3686:1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
* src/octave-1-gnulib-isatty.patch: added file.
* src/stable-octave-1-gnulib-isatty.patch: added file
* dist-files.mk: added octave-1-gnulib-isatty.patch, stable-octave-1-gnulib-isatty.patch
* makeinst-script.sh: removed --line-editing option from shortcuts if Win8.
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Fri, 15 Aug 2014 22:27:34 -0400 |
parents | |
children |
rev | line source |
---|---|
3686
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
1 Patch based on savannah.gnu.org/bugs/?327623#attached |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
2 |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
3 diff -ur octave-3.8.2-rc2.orig/libgnu/isatty.c octave-3.8.2-rc2/libgnu/isatty.c |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
4 --- octave-3.8.2-rc2.orig/libgnu/isatty.c 2014-08-12 15:31:01.710229546 -0400 |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
5 +++ octave-3.8.2-rc2/libgnu/isatty.c 2014-08-12 15:41:15.603406658 -0400 |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
6 @@ -34,7 +34,13 @@ |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
7 |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
8 /* Optimized test whether a HANDLE refers to a console. |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
9 See <http://lists.gnu.org/archive/html/bug-gnulib/2009-08/msg00065.html>. */ |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
10 -#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3) |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
11 +//#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3) |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
12 +static BOOL |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
13 +IsConsoleHandle(HANDLE h) |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
14 +{ |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
15 + DWORD mode; |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
16 + return GetConsoleMode(h, &mode) != 0; |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
17 +} |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
18 |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
19 #if HAVE_MSVC_INVALID_PARAMETER_HANDLER |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
20 static int |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
21 diff -ur octave-3.8.2-rc2.orig/libgnu/select.c octave-3.8.2-rc2/libgnu/select.c |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
22 --- octave-3.8.2-rc2.orig/libgnu/select.c 2014-08-12 15:31:01.704229427 -0400 |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
23 +++ octave-3.8.2-rc2/libgnu/select.c 2014-08-12 15:44:44.268552023 -0400 |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
24 @@ -84,7 +84,14 @@ |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
25 |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
26 /* Optimized test whether a HANDLE refers to a console. |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
27 See <http://lists.gnu.org/archive/html/bug-gnulib/2009-08/msg00065.html>. */ |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
28 -#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3) |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
29 +//#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3) |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
30 +static BOOL |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
31 +IsConsoleHandle(HANDLE h) |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
32 +{ |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
33 + DWORD mode; |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
34 + return GetConsoleMode(h, &mode) != 0; |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
35 +} |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
36 + |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
37 |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
38 static BOOL |
1e623b4ce67b
octave: add gnulib isatty fix patch (bug #37623)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
39 IsSocketHandle (HANDLE h) |