From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27354 invoked by alias); 1 Aug 2002 04:58:12 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 27342 invoked from network); 1 Aug 2002 04:58:06 -0000 Received: from unknown (HELO mail-out2.apple.com) (17.254.0.51) by sources.redhat.com with SMTP; 1 Aug 2002 04:58:06 -0000 Received: from mailgate2.apple.com (A17-129-100-225.apple.com [17.129.100.225]) by mail-out2.apple.com (8.11.3/8.11.3) with ESMTP id g714w5A10946 for ; Wed, 31 Jul 2002 21:58:05 -0700 (PDT) Received: from scv2.apple.com (scv2.apple.com) by mailgate2.apple.com (Content Technologies SMTPRS 4.2.1) with ESMTP id for ; Wed, 31 Jul 2002 21:58:05 -0700 Received: from apple.com (vpn-scv-x3-44.apple.com [17.219.194.44]) by scv2.apple.com (8.11.3/8.11.3) with ESMTP id g714w0T16888 for ; Wed, 31 Jul 2002 21:58:02 -0700 (PDT) Message-ID: <3D48BF9C.60607@apple.com> Date: Wed, 31 Jul 2002 23:21:00 -0000 From: Stan Shebs User-Agent: Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-US; rv:0.9.4.1) Gecko/20020508 Netscape6/6.2.3 X-Accept-Language: en-us MIME-Version: 1.0 To: gcc-patches@gcc.gnu.org Subject: [PATCH] Still more #ifs in stddef.h Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-SW-Source: 2002-07/txt/msg01914.txt.bz2 Continuing in the grand tradition of BSD derivatives :-), Jaguar needs a couple more tests in ginclude/stddef.h in order for GCC to include system headers and still be able to bootstrap. While I could just declare these part of Darwin 6.0 (Jaguar) support and check them in I'd like to get at least one pair of eyes, preferably BSD-knowledgeable, to tell me if this is going to crumble other systems in some new and twisted way... Thanks to Andreas Tobler for figuring out the rune_t one! Stan 2002-07-31 Stan Shebs Andreas Tobler * ginclude/stddef.h (_BSD_SIZE_T_DEFINED_): Define if not defined, plays nice with Darwin headers. (_BSD_RUNE_T_DEFINED_): Likewise. Index: stddef.h =================================================================== RCS file: /cvs/gcc/gcc/gcc/ginclude/stddef.h,v retrieving revision 1.14 diff -p -r1.14 stddef.h *** stddef.h 9 Jan 2002 04:56:25 -0000 1.14 --- stddef.h 1 Aug 2002 04:41:35 -0000 *************** typedef __PTRDIFF_TYPE__ ptrdiff_t; *** 175,180 **** --- 175,181 ---- #ifndef _BSD_SIZE_T_ #ifndef _SIZE_T_DEFINED_ #ifndef _SIZE_T_DEFINED + #ifndef _BSD_SIZE_T_DEFINED_ /* Darwin */ #ifndef ___int_size_t_h #ifndef _GCC_SIZE_T #ifndef _SIZET_ *************** typedef __PTRDIFF_TYPE__ ptrdiff_t; *** 190,195 **** --- 191,197 ---- #define _BSD_SIZE_T_ #define _SIZE_T_DEFINED_ #define _SIZE_T_DEFINED + #define _BSD_SIZE_T_DEFINED_ /* Darwin */ #define ___int_size_t_h #define _GCC_SIZE_T #define _SIZET_ *************** typedef long ssize_t; *** 207,212 **** --- 209,215 ---- #endif /* _SIZET_ */ #endif /* _GCC_SIZE_T */ #endif /* ___int_size_t_h */ + #endif /* _BSD_SIZE_T_DEFINED_ */ #endif /* _SIZE_T_DEFINED */ #endif /* _SIZE_T_DEFINED_ */ #endif /* _BSD_SIZE_T_ */ *************** typedef long ssize_t; *** 239,244 **** --- 242,248 ---- #ifndef _WCHAR_T_ #ifndef _BSD_WCHAR_T_ #ifndef _BSD_WCHAR_T_DEFINED_ /* Darwin */ + #ifndef _BSD_RUNE_T_DEFINED_ /* Darwin */ #ifndef _WCHAR_T_DEFINED_ #ifndef _WCHAR_T_DEFINED #ifndef _WCHAR_T_H *************** typedef long ssize_t; *** 276,281 **** --- 280,286 ---- #if !defined (_ANSI_SOURCE) && !defined (_POSIX_SOURCE) typedef _BSD_RUNE_T_ rune_t; #define _BSD_WCHAR_T_DEFINED_ + #define _BSD_RUNE_T_DEFINED_ /* Darwin */ #if defined (__FreeBSD__) /* Why is this file so hard to maintain properly? In constrast to the comment above regarding BSD/386 1.1, on FreeBSD for as long *************** typedef __WCHAR_TYPE__ wchar_t; *** 299,304 **** --- 304,310 ---- #endif #endif #endif + #endif /* _BSD_RUNE_T_DEFINED_ */ #endif #endif #endif