From patchwork Mon Aug 22 18:33:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 662053 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sJjR86GwCz9t0t for ; Wed, 24 Aug 2016 06:56:36 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756070AbcHWU4d (ORCPT ); Tue, 23 Aug 2016 16:56:33 -0400 Received: from mail.kapsi.fi ([217.30.184.167]:37139 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755156AbcHWU4b (ORCPT ); Tue, 23 Aug 2016 16:56:31 -0400 Received: from lakka.kapsi.fi ([2001:1bc8:1004::1] ident=Debian-exim) by mail.kapsi.fi with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1bcIkI-0005F9-3X for netdev@vger.kernel.org; Tue, 23 Aug 2016 23:56:30 +0300 Received: from mcfrisk by lakka.kapsi.fi with local (Exim 4.84_2) (envelope-from ) id 1bcIkI-0001TS-2X for netdev@vger.kernel.org; Tue, 23 Aug 2016 23:56:30 +0300 Received: from nyssemenee.iki.fi ([195.140.195.196]) by mail.kapsi.fi with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1bbuRT-0004ZQ-I7 for mcfrisk@kapsi.fi; Mon, 22 Aug 2016 21:59:28 +0300 Received: from eilopu.iki.fi (eilopu.iki.fi [212.16.98.57]) by nyssemenee.iki.fi (8.15.2/8.15.2) with ESMTPS id u7MIxQsD004172 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Mon, 22 Aug 2016 21:59:27 +0300 (EEST) Received: from mail.kapsi.fi (mx1.kapsi.fi [IPv6:2001:1bc8:1004:0:0:0:1:25] (may be forged)) by eilopu.iki.fi (8.15.2/8.15.2) with ESMTPS id u7MIxQld015241 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO) for ; Mon, 22 Aug 2016 21:59:26 +0300 (EEST) Received: from [2a02:8070:d18f:5c00:bc6b:5a80:6b8d:855c] (helo=localhost.localdomain) by mail.kapsi.fi with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1bbu8G-0004Ss-5t; Mon, 22 Aug 2016 21:39:36 +0300 From: Mikko Rapeli To: linux-kernel@vger.kernel.org Cc: Mikko Rapeli , "David S. Miller" , Nicolas Dichtel Date: Mon, 22 Aug 2016 20:33:29 +0200 Message-Id: <1471890809-4383-73-git-send-email-mikko.rapeli@iki.fi> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1471890809-4383-1-git-send-email-mikko.rapeli@iki.fi> References: <1471890809-4383-1-git-send-email-mikko.rapeli@iki.fi> MIME-Version: 1.0 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail X-Spam-Level: X-Spam-Status: No, score=-3.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD,SPF_NEUTRAL autolearn=ham version=3.3.2 Subject: [PATCH v05 72/72] uapi route.h: glibc net/route.h compat fix X-UID: 141754 X-SA-Exim-Connect-IP: 2001:1bc8:1004::1 X-SA-Exim-Mail-From: mikko.rapeli@iki.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fixes this userspace compile error when net/route.h is included before linux/route.h: linux/route.h:30:8: error: redefinition of ‘struct rtentry’ Signed-off-by: Mikko Rapeli --- include/uapi/linux/libc-compat.h | 10 ++++++++++ include/uapi/linux/route.h | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h index 07a3462..16ba7dc 100644 --- a/include/uapi/linux/libc-compat.h +++ b/include/uapi/linux/libc-compat.h @@ -230,6 +230,13 @@ #endif /* defined(_NETROSE_ROSE_H) */ +/* Coordinate with glibc net/route.h */ +#if defined(_NET_ROUTE_H) +#define __UAPI_DEF_RTENTRY 0 +#else /* defined(_NET_ROUTE_H) */ +#define __UAPI_DEF_RTENTRY 1 +#endif /* defined(_NET_ROUTE_H) */ + /* Coordinate with glibc pty.h */ #if defined(_PTY_H) #define __UAPI_DEF_TERMIOS 0 @@ -369,6 +376,9 @@ #define __UAPI_DEF_ROSE_CAUSE_STRUCT 1 #define __UAPI_DEF_ROSE_FACILITIES_STRUCT 1 +/* Definitions for route.h */ +#define __UAPI_DEF_RTENTRY 1 + /* Definitions for time.h */ #define __UAPI_DEF_TIMESPEC 1 #define __UAPI_DEF_TIMEVAL 1 diff --git a/include/uapi/linux/route.h b/include/uapi/linux/route.h index 6600708..7b77ef2 100644 --- a/include/uapi/linux/route.h +++ b/include/uapi/linux/route.h @@ -23,10 +23,12 @@ #ifndef _LINUX_ROUTE_H #define _LINUX_ROUTE_H +#include #include #include /* This structure gets passed by the SIOCADDRT and SIOCDELRT calls. */ +#if __UAPI_DEF_RTENTRY struct rtentry { unsigned long rt_pad1; struct sockaddr rt_dst; /* target address */ @@ -45,7 +47,7 @@ struct rtentry { unsigned long rt_window; /* Window clamping */ unsigned short rt_irtt; /* Initial RTT */ }; - +#endif /* __UAPI_DEF_RTENTRY */ #define RTF_UP 0x0001 /* route usable */ #define RTF_GATEWAY 0x0002 /* destination is a gateway */