diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/ada/sysdep.c | 25 |
2 files changed, 16 insertions, 13 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index bd97c1b..7eb75cd 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,7 @@ +2012-03-13 Tristan Gingold <gingold@adacore.com> + + * sysdep.c: Adjust condition after removal of __osf__. + 2012-03-12 Eric Botcazou <ebotcazou@adacore.com> * gcc-interface/gigi.h (shift_unc_components_for_thin_pointers): Kill. diff --git a/gcc/ada/sysdep.c b/gcc/ada/sysdep.c index 6d77a76..3fc51f8 100644 --- a/gcc/ada/sysdep.c +++ b/gcc/ada/sysdep.c @@ -252,27 +252,27 @@ __gnat_ttyname (int filedes) #endif #if defined (linux) || defined (sun) || defined (sgi) \ - || ! defined (__alpha_vxworks) || defined (WINNT) \ + || defined (WINNT) \ || defined (__MACHTEN__) || defined (__hpux__) || defined (_AIX) \ || (defined (__svr4__) && defined (i386)) || defined (__Lynx__) \ || defined (__CYGWIN__) || defined (__FreeBSD__) || defined (__OpenBSD__) \ || defined (__GLIBC__) || defined (__APPLE__) -#ifdef __MINGW32__ -#if OLD_MINGW -#include <termios.h> -#else -#include <conio.h> /* for getch(), kbhit() */ -#endif -#else -#include <termios.h> -#endif +# ifdef __MINGW32__ +# if OLD_MINGW +# include <termios.h> +# else +# include <conio.h> /* for getch(), kbhit() */ +# endif +# else +# include <termios.h> +# endif #else -#if defined (VMS) +# if defined (VMS) extern char *decc$ga_stdscr; static int initted = 0; -#endif +# endif #endif /* Implements the common processing for getc_immediate and @@ -310,7 +310,6 @@ getc_immediate_common (FILE *stream, int waiting) { #if defined (linux) || defined (sun) || defined (sgi) \ - || ! defined (__alpha_vxworks) \ || defined (__CYGWIN32__) || defined (__MACHTEN__) || defined (__hpux__) \ || defined (_AIX) || (defined (__svr4__) && defined (i386)) \ || defined (__Lynx__) || defined (__FreeBSD__) || defined (__OpenBSD__) \ |