From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9210 invoked by alias); 13 Mar 2012 09:07:16 -0000 Received: (qmail 9200 invoked by uid 22791); 13 Mar 2012 09:07:15 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from mel.act-europe.fr (HELO mel.act-europe.fr) (194.98.77.210) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 13 Mar 2012 09:06:58 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 07804290020; Tue, 13 Mar 2012 10:06:59 +0100 (CET) Received: from mel.act-europe.fr ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OPOccV5hm3H5; Tue, 13 Mar 2012 10:06:58 +0100 (CET) Received: from ulanbator.act-europe.fr (ulanbator.act-europe.fr [10.10.1.67]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mel.act-europe.fr (Postfix) with ESMTP id CF423290014; Tue, 13 Mar 2012 10:06:58 +0100 (CET) Subject: Re: Remove obsolete Tru64 UNIX V5.1B support Mime-Version: 1.0 (Apple Message framework v1257) Content-Type: text/plain; charset=GB2312 From: Tristan Gingold In-Reply-To: Date: Tue, 13 Mar 2012 09:07:00 -0000 Cc: GCC Patches , Arnaud Charlet Content-Transfer-Encoding: quoted-printable Message-Id: References: To: Rainer Orth X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2012-03/txt/msg00894.txt.bz2 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 * 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 =20 #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__) =20 -#ifdef __MINGW32__ -#if OLD_MINGW -#include -#else -#include /* for getch(), kbhit() */ -#endif -#else -#include -#endif +# ifdef __MINGW32__ +# if OLD_MINGW +# include +# else +# include /* for getch(), kbhit() */ +# endif +# else +# include +# endif =20 #else -#if defined (VMS) +# if defined (VMS) extern char *decc$ga_stdscr; static int initted =3D 0; -#endif +# endif #endif =20 /* Implements the common processing for getc_immediate and