From patchwork Tue Mar 26 15:25:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Belemezov X-Patchwork-Id: 231419 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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 525002C0084 for ; Wed, 27 Mar 2013 02:46:20 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:content-type:mime-version :content-transfer-encoding:subject:message-id:in-reply-to :references:date:from:to; q=dns; s=default; b=L97HgjewdNIMmFzDhq BKV19hZSdbeWzbFCJFyg7ArVnsAlrBgmvhzmEMVGDhJWzqCKFKtjjuFMrkOMeA38 TILUtNwP0C+HFm0zgnzB+ISTU8C0Wl3vDiuIr+DkyoTTYVXBuYTEUluvcFzrCY8f 6Svyj5T52ttf3L18/SXzqubl4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:content-type:mime-version :content-transfer-encoding:subject:message-id:in-reply-to :references:date:from:to; s=default; bh=EALgL2XnT+rMvnKjJzsrEunW iBk=; b=jBAcddMPGadVjUKGMbLforpfPXykQ8B8pjoLMnz3F5J1L3LirbIYUJUG pOhcZk2hZTe1Qh55IoaKatdey9n8UC4aBZC/dm1Zj1foRFq8iKHgUVD1MBWwr/t2 bPyCZkYy8Ow8W0Ix9+VUSuFItwcKJ+0g2ioJhA6JDN8hIA8fgHY= Received: (qmail 8137 invoked by alias); 26 Mar 2013 15:28:02 -0000 Mailing-List: contact crossgcc-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: crossgcc-owner@sourceware.org Delivered-To: mailing list crossgcc@sourceware.org Received: (qmail 7884 invoked by uid 89); 26 Mar 2013 15:27:56 -0000 X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, TW_FC, TW_FN autolearn=ham version=3.3.1 Received: from mail-bk0-f53.google.com (HELO mail-bk0-f53.google.com) (209.85.214.53) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Tue, 26 Mar 2013 15:27:53 +0000 Received: by mail-bk0-f53.google.com with SMTP id e19so1394378bku.12 for ; Tue, 26 Mar 2013 08:27:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:content-type:mime-version:content-transfer-encoding :subject:x-mercurial-node:message-id:in-reply-to:references :user-agent:date:from:to:x-gm-message-state; bh=md/jw2TsKTsRQ41f7scY/PR/mvMpIS4fiBkInQsgQxs=; b=MgHfcncYLUjEBbYmxSkTLqc4ga3EAdlS8TxPvkwSu7QzSNsOTjDWOjOpqP2c+uoCEM 2C6cViEp5wbcYsx167FNUhG+ECnGqMI7EN6D6BXJIdVvTqWNNCi9uNSPNTl1iaofeKKc S/3Z5N48fHXW34xkbp0QJNAtfSGAnlmhdoA04I2g27+mztuWO7FgQViLEP1ib3eXAo5L Mqgy9XQ39C8mM6S1iieZfk/rsbwW8XmymQ4isfEz9BiQcVGJ3g0x6/Lt7qK3RQc5C2bX zMTQjJ6So3DMT2VTi1T8LN9yJ+aVbSwMtwXnWAlhOGy7EihHyPmVoLIXR8cu53Qao1ST byqQ== X-Received: by 10.204.246.4 with SMTP id lw4mr7964315bkb.36.1364311671081; Tue, 26 Mar 2013 08:27:51 -0700 (PDT) Received: from ([212.36.1.26]) by mx.google.com with ESMTPS id r17sm4206963bkw.21.2013.03.26.08.27.49 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 26 Mar 2013 08:27:50 -0700 (PDT) MIME-Version: 1.0 Subject: [PATCH 2 of 2] libc/eglibc: [OS X] Don't Redefine Already Defined Types in rpc/types.h X-Mercurial-Node: 0926f7ff958ad637d4727e4e02ed2900ce29291a Message-Id: <0926f7ff958ad637d472.1364311532@Loki.local> In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.5.2 Date: Tue, 26 Mar 2013 17:25:32 +0200 From: Philip Belemezov To: crossgcc@sourceware.org X-Gm-Message-State: ALoCoQmtHxzDMNyrYfSHB/kx5CEyF+k3w4jdS09y9rP+0u1RtX2YKunBTD0hov/SUBha6JLBzlIR # HG changeset patch # User Philip Belemezov # Date 1364300929 -7200 # Node ID 0926f7ff958ad637d4727e4e02ed2900ce29291a # Parent fcdf7fc7fd1c00715c3d9651ff00d805ecfb8aa8 libc/eglibc: [OS X] Don't Redefine Already Defined Types in rpc/types.h Apple already defines the u_char, u_short, etc. types in . However, those are defined directly, without using the __u_char types. So, don't even try to define those on OS X. Signed-Off-By: Philip Belemezov --- For unsubscribe information see http://sourceware.org/lists.html#faq diff -r fcdf7fc7fd1c -r 0926f7ff958a patches/eglibc/2_17/osx_do_not_redefine_types_sunrpc.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/eglibc/2_17/osx_do_not_redefine_types_sunrpc.patch Tue Mar 26 14:28:49 2013 +0200 @@ -0,0 +1,39 @@ +Apple already defines the u_char, u_short, etc. types in . +However, those are defined directly, without using the __u_char types. + +diff -Naur eglibc-2_17-old/sunrpc/rpc/types.h eglibc-2_17-new/sunrpc/rpc/types.h +--- eglibc-2_17-old/sunrpc/rpc/types.h 2010-08-19 23:32:31.000000000 +0300 ++++ eglibc-2_17-new/sunrpc/rpc/types.h 2013-03-26 01:16:16.000000000 +0200 +@@ -69,7 +69,11 @@ + #include + #endif + +-#ifndef __u_char_defined ++/* ++ * OS X already has these ++ */ ++#ifndef __APPLE__ ++# ifndef __u_char_defined + typedef __u_char u_char; + typedef __u_short u_short; + typedef __u_int u_int; +@@ -77,13 +81,14 @@ + typedef __quad_t quad_t; + typedef __u_quad_t u_quad_t; + typedef __fsid_t fsid_t; +-# define __u_char_defined +-#endif +-#ifndef __daddr_t_defined ++# define __u_char_defined ++# endif ++# ifndef __daddr_t_defined + typedef __daddr_t daddr_t; + typedef __caddr_t caddr_t; +-# define __daddr_t_defined +-#endif ++# define __daddr_t_defined ++# endif ++#endif /* __APPLE__ */ + + #include + #include