From patchwork Sun Feb 12 01:09:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerald Pfeifer X-Patchwork-Id: 140797 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 B5447B6FA0 for ; Sun, 12 Feb 2012 12:08:15 +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=1329613697; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Date: From:To:cc:Subject:In-Reply-To:Message-ID:References: MIME-Version:Content-Type:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=dDgNJPMBx/WRX5p30vSwAaBjoK8=; b=jRPqEMy8s/EVP71 By6Xe1+Kgk+dmVyIpPE/ESzRzYqkMOiMg+oP9g1gXmi1Q+mvbuBb+YBMQ1PvwfrR anEvhOmHU2MSoGFgGCjY9vLh78NDL+ILi0QJRg8cW6M3z+mXVhQBcQAMiFAovs7I yEjkNQh7Hr5K2lvTZ5L9RLLVL5eA= 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:Date:From:To:cc:Subject:In-Reply-To:Message-ID:References:MIME-Version:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=XoEl/6pKJLg6grnnaOaGQn7LRKd7hrjy5t7PotuoW5k6IAA1tWns7n5CiEI3mH FWx2vsiCTv7fFzVvkCQtjTEqb7hGYhy/t9V5NuIiytOruFLSvw9DvknU3wyJ+tEW WWwN8/VJD9pumtctnvEuHIWKupJM8btzm7LaixE8daYbs=; Received: (qmail 16924 invoked by alias); 12 Feb 2012 01:08:11 -0000 Received: (qmail 16916 invoked by uid 22791); 12 Feb 2012 01:08:10 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from ainaz.pair.com (HELO ainaz.pair.com) (209.68.2.66) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 12 Feb 2012 01:07:58 +0000 Received: from L62.suse.de (charybdis-ext.suse.de [195.135.221.2]) by ainaz.pair.com (Postfix) with ESMTPSA id 585153F416; Sat, 11 Feb 2012 20:07:56 -0500 (EST) Date: Sun, 12 Feb 2012 02:09:15 +0100 (CET) From: Gerald Pfeifer To: Robert Millan cc: Mike Stump , gcc-patches@gcc.gnu.org Subject: Re: [PATCH] disable __size_t macro on GNU/kFreeBSD In-Reply-To: Message-ID: References: <3FC1B828-887C-4EFD-A36A-13818A8F5DB8@comcast.net> MIME-Version: 1.0 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 Given that both Mike and me considered this patch on the obvious side, I now committed the following variation thereof on trunk. (Note the line break and comment change. 5! = 120 did not seem like a useful version number. ;-) Gerald Index: ginclude/stddef.h =================================================================== --- ginclude/stddef.h (revision 184130) +++ ginclude/stddef.h (working copy) @@ -200,8 +200,9 @@ #define ___int_size_t_h #define _GCC_SIZE_T #define _SIZET_ -#if defined (__FreeBSD__) && (__FreeBSD__ >= 5) -/* __size_t is a typedef on FreeBSD 5!, must not trash it. */ +#if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \ + || defined(__FreeBSD_kernel__) +/* __size_t is a typedef on FreeBSD 5, must not trash it. */ #else #define __size_t #endif