From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758067AbbE3Q37 (ORCPT ); Sat, 30 May 2015 12:29:59 -0400 Received: from mail.kapsi.fi ([217.30.184.167]:35622 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755414AbbE3Q3v (ORCPT ); Sat, 30 May 2015 12:29:51 -0400 From: Mikko Rapeli To: linux-kernel@vger.kernel.org Cc: Mikko Rapeli , "David S. Miller" , Willem de Bruijn , linux-api@vger.kernel.org Subject: [PATCH 98/98] HACK include/uapi/linux/errqueue.h: include time.h in userspace Date: Sat, 30 May 2015 17:39:30 +0200 Message-Id: <1433000370-19509-99-git-send-email-mikko.rapeli@iki.fi> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1433000370-19509-1-git-send-email-mikko.rapeli@iki.fi> References: <1433000370-19509-1-git-send-email-mikko.rapeli@iki.fi> X-SA-Exim-Connect-IP: 2a02:8070:d18d:d800:7c0d:5e59:fd9c:b615 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 linux/time.h conflicts with userspace header time.h. Try to be compatible for kernel and userspace. 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