Rainer,
this chunk:
--- a/gcc/ada/sysdep.c
+++ b/gcc/ada/sysdep.c
@@ -252,27 +254,27 @@ __gnat_ttyname (int filedes)
#endif
^L
#if defined (linux) || defined (sun) || defined (sgi) \
- || (defined (__osf__) && ! defined (__alpha_vxworks)) || defined (WINNT) \
+ || ! defined (__alpha_vxworks) || defined (WINNT) \
|| defined (__MACHTEN__) || defined (__hpux__) || defined (_AIX) \
|| (defined (__svr4__) && defined (i386)) || defined (__Lynx__) \
|| defined (__CYGWIN__) || defined (__FreeBSD__) || defined (__OpenBSD__) \
|| defined (__GLIBC__) || defined (__APPLE__)
is not correct, '! defined (__alpha_vxworks)' should have been removed too.
I will commit this fix (as obvious):
ada/
2012-03-13 Tristan Gingold <ging...@adacore.com>
* sysdep.c: Adjust condition after removal of __osf__.
Indent nested directives.
diff --git a/gcc/ada/sysdep.c b/gcc/ada/sysdep.c
index 0669c2f..37cb8d7 100644
--- a/gcc/ada/sysdep.c
+++ b/gcc/ada/sysdep.c
@@ -254,27 +254,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
