git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sysdep.c: Adjust condition after removal of __osf__. 

2012-03-13  Tristan Gingold  <gingold@adacore.com>

	* sysdep.c: Adjust condition after removal of __osf__.

From-SVN: r185335
This commit is contained in:
Tristan Gingold 2012-03-13 14:17:52 +00:00 committed by Tristan Gingold
parent 0c12cd5e90
commit 3985be599e
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/ada/ChangeLog
View File

@ -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> 2012-03-12 Eric Botcazou <ebotcazou@adacore.com>
* gcc-interface/gigi.h (shift_unc_components_for_thin_pointers): Kill. * gcc-interface/gigi.h (shift_unc_components_for_thin_pointers): Kill.

25
gcc/ada/sysdep.c
View File

@ -252,27 +252,27 @@ __gnat_ttyname (int filedes)
#endif #endif
#if defined (linux) || defined (sun) || defined (sgi) \ #if defined (linux) || defined (sun) || defined (sgi) \
|| ! defined (__alpha_vxworks) || defined (WINNT) \ || defined (WINNT) \
|| defined (__MACHTEN__) || defined (__hpux__) || defined (_AIX) \ || defined (__MACHTEN__) || defined (__hpux__) || defined (_AIX) \
|| (defined (__svr4__) && defined (i386)) || defined (__Lynx__) \ || (defined (__svr4__) && defined (i386)) || defined (__Lynx__) \
|| defined (__CYGWIN__) || defined (__FreeBSD__) || defined (__OpenBSD__) \ || defined (__CYGWIN__) || defined (__FreeBSD__) || defined (__OpenBSD__) \
|| defined (__GLIBC__) || defined (__APPLE__) || defined (__GLIBC__) || defined (__APPLE__)
#ifdef __MINGW32__ # ifdef __MINGW32__
#if OLD_MINGW # if OLD_MINGW
#include <termios.h> # include <termios.h>
#else # else
#include <conio.h> /* for getch(), kbhit() */ # include <conio.h> /* for getch(), kbhit() */
#endif # endif
#else # else
#include <termios.h> # include <termios.h>
#endif # endif
#else #else
#if defined (VMS) # if defined (VMS)
extern char *decc$ga_stdscr; extern char *decc$ga_stdscr;
static int initted = 0; static int initted = 0;
#endif # endif
#endif #endif
/* Implements the common processing for getc_immediate and /* Implements the common processing for getc_immediate and
@ -310,7 +310,6 @@ getc_immediate_common (FILE *stream,
int waiting) int waiting)
{ {
#if defined (linux) || defined (sun) || defined (sgi) \ #if defined (linux) || defined (sun) || defined (sgi) \
|| ! defined (__alpha_vxworks) \
|| defined (__CYGWIN32__) || defined (__MACHTEN__) || defined (__hpux__) \ || defined (__CYGWIN32__) || defined (__MACHTEN__) || defined (__hpux__) \
|| defined (_AIX) || (defined (__svr4__) && defined (i386)) \ || defined (_AIX) || (defined (__svr4__) && defined (i386)) \
|| defined (__Lynx__) || defined (__FreeBSD__) || defined (__OpenBSD__) \ || defined (__Lynx__) || defined (__FreeBSD__) || defined (__OpenBSD__) \