From patchwork Tue Mar 13 09:06:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tristan Gingold X-Patchwork-Id: 146371 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 127F8B6EEA for ; Tue, 13 Mar 2012 20:07:21 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1332234444; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Subject:Mime-Version:Content-Type:From:In-Reply-To:Date: Cc:Content-Transfer-Encoding:Message-Id:References:To: Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:Sender:Delivered-To; bh=lLIkHgQeWlCMJLS1FVxC RNMu6cM=; b=yZCH8oM2YJnDksBvS6phR586cb9xtLQbd4kIMTxtye61UBtq0eji Mnjat4g3SyJnOitNi2dMYw/Z+YXVr36g7jqtinK+6dxvSvLhxMTOK8Blz8X8SDGn 5g3tkLvR/djR01bJ1lsraTP/N3dkO1LK/n+bpzds1UYJRfkuOE89Vu0= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Received:Subject:Mime-Version:Content-Type:From:In-Reply-To:Date:Cc:Content-Transfer-Encoding:Message-Id:References:To:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=IRPWIcJU4Or4J1yCJ9/4KfHov9Anv3zE5fFJdjkqJG26L21CK9YwFJ6UC0nbFX YsM93NMvbN1H/WMo5FqzZocfCwFhWa1URzl1OIQQkDbuUvkxkuH3EAFF3D9u609D kEn4DH+g0Ly25wJ2s4vhMh3HhKVJ23VuPkKMX+2PL8ir8=; 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) From: Tristan Gingold In-Reply-To: Date: Tue, 13 Mar 2012 10:06:56 +0100 Cc: GCC Patches , Arnaud Charlet 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-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Rainer, this chunk: - || ! 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 -#else -#include /* for getch(), kbhit() */ -#endif -#else -#include -#endif +# ifdef __MINGW32__ +# if OLD_MINGW +# include +# else +# include /* for getch(), kbhit() */ +# endif +# else +# include +# 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 --- 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 #if defined (linux) || defined (sun) || defined (sgi) \