From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753469AbbJFT4e (ORCPT ); Tue, 6 Oct 2015 15:56:34 -0400 Received: from mail.kapsi.fi ([217.30.184.167]:43218 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752719AbbJFT43 (ORCPT ); Tue, 6 Oct 2015 15:56:29 -0400 Date: Tue, 6 Oct 2015 22:56:24 +0300 From: Mikko Rapeli To: linux-kernel@vger.kernel.org Cc: "David S. Miller" , Willem de Bruijn , linux-api@vger.kernel.org Subject: Re: [PATCH 98/98] HACK include/uapi/linux/errqueue.h: include time.h in userspace Message-ID: <20151006195624.GO6104@lakka.kapsi.fi> References: <1433000370-19509-1-git-send-email-mikko.rapeli@iki.fi> <1433000370-19509-99-git-send-email-mikko.rapeli@iki.fi> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1433000370-19509-99-git-send-email-mikko.rapeli@iki.fi> 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: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On Sat, May 30, 2015 at 05:39:30PM +0200, Mikko Rapeli wrote: > linux/time.h conflicts with userspace header time.h. Try to be compatible > for kernel and userspace. Any comments about this change? I assume the and incompatibility in userspace is a known thing and the resulting definitions are compatible. -Mikko > Signed-off-by: Mikko Rapeli > --- > include/uapi/linux/errqueue.h | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/include/uapi/linux/errqueue.h b/include/uapi/linux/errqueue.h > index 6b1cdc6..b310b2c 100644 > --- a/include/uapi/linux/errqueue.h > +++ b/include/uapi/linux/errqueue.h > @@ -2,7 +2,12 @@ > #define _UAPI_LINUX_ERRQUEUE_H > > #include > + > +#ifdef __KERNEL__ > #include > +#else > +#include > +#endif /* __KERNEL__ */ > > struct sock_extended_err { > __u32 ee_errno; > -- > 2.1.4 >