Mercurial > mxe-octave
view src/mingw-texinfo-1-fixes.patch @ 4423:8c4a121b1e71
of-linear-algebra: add patch for dev octave
* src/of-linear-algebra-2-dev-fixes.patch: new file
* dist-files.mk: add of-linear-algebra-2-dev-fixes.patch
author | John D |
---|---|
date | Fri, 14 Jul 2017 11:57:08 -0400 |
parents | e50cac70e5a7 |
children | b88723578fec |
line wrap: on
line source
diff -ur texinfo-6.3.orig/info/echo-area.c texinfo-6.3/info/echo-area.c --- texinfo-6.3.orig/info/echo-area.c 2016-12-17 14:57:59.207522263 -0500 +++ texinfo-6.3/info/echo-area.c 2016-12-17 14:58:29.837452042 -0500 @@ -1528,7 +1528,7 @@ static void pause_or_input (void) { -#ifdef FD_SET +#if defined(FD_SET) && !defined(__MINGW32__) struct timeval timer; fd_set readfds; diff -ur texinfo-6.3.orig/info/man.c texinfo-6.3/info/man.c --- texinfo-6.3.orig/info/man.c 2016-12-17 14:57:59.212939079 -0500 +++ texinfo-6.3/info/man.c 2016-12-17 14:58:29.837452042 -0500 @@ -414,7 +414,7 @@ int bsize = 0; int bindex = 0; int select_result; -#if defined (FD_SET) +#if defined (FD_SET) && !defined(__MINGW32__) fd_set read_fds; timeout.tv_sec = 15; diff -ur texinfo-6.3.orig/info/pcterm.c texinfo-6.3/info/pcterm.c --- texinfo-6.3.orig/info/pcterm.c 2016-12-17 14:57:59.206438899 -0500 +++ texinfo-6.3/info/pcterm.c 2016-12-17 14:58:29.836368678 -0500 @@ -1621,7 +1621,7 @@ } /* These should never be called, but they make the linker happy. */ - +#ifndef __MINGW32__ int tputs (const char *a, int b, int (*c)(int)) { perror ("tputs"); return 0; /* here and below, added dummy retvals */ @@ -1661,3 +1661,4 @@ { perror ("tcsetattr"); return 0; } +#endif diff -ur texinfo-6.3.orig/info/session.c texinfo-6.3/info/session.c --- texinfo-6.3.orig/info/session.c 2016-12-17 14:57:59.212939079 -0500 +++ texinfo-6.3/info/session.c 2016-12-17 14:58:29.838535405 -0500 @@ -456,7 +456,7 @@ space_avail = sizeof (info_input_buffer) - (push_index - pop_index); /* If we can just find out how many characters there are to read, do so. */ -#if defined (FIONREAD) +#if defined (FIONREAD) && !defined(__MINGW32__) { ioctl (tty, FIONREAD, &chars_avail); @@ -648,7 +648,7 @@ if (in_map && pop_index == push_index) { int ready = 0; -#if defined (FD_SET) +#if defined (FD_SET) && !defined(__MINGW32__) struct timeval timer, *timerp = 0; fd_set readfds; @@ -5490,7 +5490,7 @@ ready = 1; if (!info_any_buffered_input_p ()) { -#if defined (FD_SET) +#if defined (FD_SET) && !defined(__MINGW32__) struct timeval timer; fd_set readfds; diff -ur texinfo-6.3.orig/tp/texi2any.pl texinfo-6.3/tp/texi2any.pl --- texinfo-6.3.orig/tp/texi2any.pl 2016-12-17 14:57:59.069935127 -0500 +++ texinfo-6.3/tp/texi2any.pl 2016-12-17 14:59:58.097974426 -0500 @@ -53,7 +53,7 @@ my $updir = File::Spec->updir(); # These are substituted by the Makefile to create "texi2any". - my $datadir = '@datadir@'; + my $datadir = '/usr/share'; my $package = '@PACKAGE@'; my $packagedir = '@pkglibdir@';