Ticket #9602: gap-4.4.12.p4.patch

File gap-4.4.12.p4.patch, 2.5 KB (added by Peter Jeremy, 12 years ago)
  • gap-4.4.12.p4/patches/sysfiles.c

    old new  
    15241524**  to cooked mode before stopping GAP and back to raw mode when continueing.
    15251525*/
    15261526
    1527 #if !SYS_IS_DARWIN && (SYS_BSD || SYS_MACH || HAVE_SGTTY_H)
     1527#if !SYS_IS_DARWIN && (SYS_BSD || SYS_MACH || HAVE_SGTTY_H) && !HAVE_TERMIOS_H
    15281528
    15291529#ifndef SYS_SGTTY_H                     /* terminal control functions      */
    15301530# include       <sgtty.h>
     
    20732073**
    20742074*f  syStopraw( <fid> )  . . . . . . . . . . . . . . . . . . . . . .  BSD/MACH
    20752075*/
    2076 #if !SYS_IS_DARWIN && (SYS_BSD || SYS_MACH || HAVE_SGTTY_H)
     2076#if !SYS_IS_DARWIN && (SYS_BSD || SYS_MACH || HAVE_SGTTY_H) && !HAVE_TERMIOS_H
    20772077
    20782078void syStopraw (
    20792079    Int                 fid )
     
    27602760**
    27612761*f  syEchoch( <ch>, <fid> ) . . . . . . . . . . . . . . . . . . . .  BSD/MACH
    27622762*/
    2763 #if SYS_BSD || SYS_MACH || HAVE_SGTTY_H
     2763#if (SYS_BSD || SYS_MACH || HAVE_SGTTY_H) && !HAVE_TERMIOS_H
    27642764
    27652765void syEchoch (
    27662766    Int                 ch,
     
    27862786**
    27872787*f  syEchoch( <ch>, <fid> ) . . . . . . . . . . . . . . . . . . . . . . . USG
    27882788*/
    2789 #if SYS_USG || HAVE_TERMIO_H
     2789#if SYS_USG || HAVE_TERMIO_H || HAVE_TERMIOS_H
    27902790
    27912791void syEchoch (
    27922792    Int                 ch,
     
    29742974**
    29752975*f  syEchos( <ch>, <fid> )  . . . . . . . . . . . . . . . . . . . .  BSD/MACH
    29762976*/
    2977 #if SYS_BSD || SYS_MACH || HAVE_SGTTY_H
     2977#if (SYS_BSD || SYS_MACH || HAVE_SGTTY_H) && !HAVE_TERMIOS_H
    29782978
    29792979void syEchos (
    29802980    Char *              str,
     
    29962996**
    29972997*f  syEchos( <ch>, <fid> )  . . . . . . . . . . . . . . . . . . . . . . . USG
    29982998*/
    2999 #if SYS_USG || HAVE_TERMIO_H
     2999#if SYS_USG || HAVE_TERMIO_H || HAVE_TERMIOS_H
    30003000
    30013001void syEchos (
    30023002    Char *              str,
     
    31493149**
    31503150*f  SyFputs( <line>, <fid> )  . . . . . . .  BSD/MACH/USG/OS2 EMX/VMS/MAC MPW
    31513151*/
    3152 #if SYS_BSD||SYS_MACH||SYS_USG||SYS_OS2_EMX||SYS_VMS||SYS_MAC_MPW||HAVE_SGTTY_H||HAVE_TERMIO_H
     3152#if SYS_BSD||SYS_MACH||SYS_USG||SYS_OS2_EMX||SYS_VMS||SYS_MAC_MPW||HAVE_SGTTY_H||HAVE_TERMIO_H||HAVE_TERMIOS_H
    31533153
    31543154void SyFputs (
    31553155    Char *              line,
     
    34763476**  that return odd things rather than waiting for a key
    34773477** 
    34783478*/
    3479 #if SYS_BSD || SYS_MACH || HAVE_SGTTY_H ||SYS_USG || HAVE_TERMIO_H
     3479#if SYS_BSD || SYS_MACH || HAVE_SGTTY_H ||SYS_USG || HAVE_TERMIO_H || HAVE_TERMIOS_H
    34803480
    34813481/* In the cygwin environment it is not predictable if text files get the
    34823482 * '\r' in their line ends filtered out *before* GAP sees them. This leads