Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751987AbdHFRYH (ORCPT ); Sun, 6 Aug 2017 13:24:07 -0400 Received: from mail.kapsi.fi ([91.232.154.25]:58516 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751828AbdHFRYF (ORCPT ); Sun, 6 Aug 2017 13:24:05 -0400 From: Mikko Rapeli To: linux-kernel@vger.kernel.org, linux-api@vger.kernel.org Cc: Mikko Rapeli , Willem de Bruijn , Soheil Hassas Yeganeh , netdev@vger.kernel.org Subject: [PATCH v06 18/36] uapi linux/errqueue.h: include linux/time.h in user space Date: Sun, 6 Aug 2017 18:44:09 +0200 Message-Id: <20170806164428.2273-19-mikko.rapeli@iki.fi> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170806164428.2273-1-mikko.rapeli@iki.fi> References: <20170806164428.2273-1-mikko.rapeli@iki.fi> X-SA-Exim-Connect-IP: 2003:6c:cd28:d400:219:d2ff:fe03:c7a9 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 Content-Length: 846 Lines: 35 linux/time.h conflicts with user space header time.h. Try to be compatible with both. Fixes userspace compilation error: error: array type has incomplete element type struct timespec ts[3]; Signed-off-by: Mikko Rapeli Cc: Willem de Bruijn Cc: Soheil Hassas Yeganeh Cc: netdev@vger.kernel.org --- include/uapi/linux/errqueue.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/uapi/linux/errqueue.h b/include/uapi/linux/errqueue.h index 07bdce1f444a..b310b2c6d94f 100644 --- a/include/uapi/linux/errqueue.h +++ b/include/uapi/linux/errqueue.h @@ -3,6 +3,12 @@ #include +#ifdef __KERNEL__ +#include +#else +#include +#endif /* __KERNEL__ */ + struct sock_extended_err { __u32 ee_errno; __u8 ee_origin; -- 2.13.3