From patchwork Mon Mar 12 08:50:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tristan Gingold X-Patchwork-Id: 146048 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 D5B32B6FA4 for ; Mon, 12 Mar 2012 19:50:24 +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=1332147025; 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=zkpotRH9//hUbH4NVhYa UnpTnQA=; b=OMKiJQdKWVbI0rvB+yPIedSrMpe4pkQfYaeqaVMkrV2sRFuy2DP8 NDQxaGEfzf+hhS5igoLw3cYyfl7HbRjwUB/5Qm4gLiyP6KFwvnwKUeSBDgICK+kN /ahkRu9X3GKuZ8HiSTULLJLanOJTDN/3h6msF8H8klAnCHPnEMAeNE8= 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=Oi24kgKthnbPZPpqnEfZXCa/Z3iFzzooYcB03FmaAjY6nadcZKxmETmpBECDN6 Ur6IyYCKdSta1/Sh1MH8m+HDPobmIhOD/yet1RKYCfgyEj4CqoQj5thxCCj4TZ4U r3Ee3RD/vZDNNmkCu1QLw3uoESiw86kKYmqIYXlWzj0vg=; Received: (qmail 8373 invoked by alias); 12 Mar 2012 08:50:19 -0000 Received: (qmail 8360 invoked by uid 22791); 12 Mar 2012 08:50:19 -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; Mon, 12 Mar 2012 08:50:03 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id BD8A1290058; Mon, 12 Mar 2012 09:50:03 +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 CxcoGEBNrQsn; Mon, 12 Mar 2012 09:50:03 +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 996D0290055; Mon, 12 Mar 2012 09:50:03 +0100 (CET) Subject: Re: [VMS/committed]: Do not define __size_t on VMS Mime-Version: 1.0 (Apple Message framework v1257) From: Tristan Gingold In-Reply-To: Date: Mon, 12 Mar 2012 09:50:01 +0100 Cc: GCC Patches Message-Id: <19DE60FF-DF06-46FD-BC52-7606953E48B4@adacore.com> References: <63DD81B3-3848-4449-A7BA-50B294D7FF19@adacore.com> To: Joseph S. Myers 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 On Mar 9, 2012, at 6:22 PM, Joseph S. Myers wrote: > On Fri, 9 Mar 2012, Tristan Gingold wrote: > >> as it is already defined and used by the system headers. >> >> No regressions for x86_64-darwin after full bootstrap. >> >> Tristan. >> >> 2012-03-09 Tristan Gingold >> >> * ginclude/stddef.h: Do not define __size_t on VMS. > > Sorry, this patch is wrong. The identifier "VMS" is in the user's > namespace and users on non-VMS platforms must be able to define it as a > macro without affecting how stddef.h behaves. Please change this to test > a macro in the implementation namespace instead. Thank you for catching that. Fixed with: 2012-03-12 Tristan Gingold * ginclude/stddef.h: Adjust previous patch. Use __VMS__ instead of VMS. Index: gcc/ginclude/stddef.h =================================================================== --- gcc/ginclude/stddef.h (revision 185212) +++ gcc/ginclude/stddef.h (working copy) @@ -203,7 +203,7 @@ #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \ || defined(__FreeBSD_kernel__) /* __size_t is a typedef on FreeBSD 5, must not trash it. */ -#elif defined (VMS) +#elif defined (__VMS__) /* __size_t is also a typedef on VMS. */ #else #define __size_t