From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755582AbcHVTig (ORCPT ); Mon, 22 Aug 2016 15:38:36 -0400 Received: from mail.kapsi.fi ([217.30.184.167]:34242 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752443AbcHVTie (ORCPT ); Mon, 22 Aug 2016 15:38:34 -0400 From: Mikko Rapeli To: linux-kernel@vger.kernel.org Cc: Mikko Rapeli Subject: [PATCH v05 59/72] include/uapi/linux/errqueue.h: include time.h in userspace Date: Mon, 22 Aug 2016 20:33:16 +0200 Message-Id: <1471890809-4383-60-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> X-SA-Exim-Connect-IP: 2a02:8070:d18f:5c00:bc6b:5a80:6b8d:855c 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.8.1