From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756692AbcHVT3a (ORCPT ); Mon, 22 Aug 2016 15:29:30 -0400 Received: from mail.kapsi.fi ([217.30.184.167]:33485 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751980AbcHVT32 (ORCPT ); Mon, 22 Aug 2016 15:29:28 -0400 From: Mikko Rapeli To: linux-kernel@vger.kernel.org Cc: Mikko Rapeli , "David S. Miller" , Nicolas Dichtel Subject: [PATCH v05 67/72] uapi uio.h: glibc sys/uio.h header file compatibility fixes Date: Mon, 22 Aug 2016 20:33:24 +0200 Message-Id: <1471890809-4383-68-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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Fixes this userspace compile error when glibc sys/uio.h is included before linux/uio.h: linux/uio.h:16:8: error: redefinition of ‘struct iovec’ Signed-off-by: Mikko Rapeli --- include/uapi/linux/libc-compat.h | 10 ++++++++++ include/uapi/linux/uio.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 8a5a7cc..f793b09 100644 --- a/include/uapi/linux/libc-compat.h +++ b/include/uapi/linux/libc-compat.h @@ -180,6 +180,13 @@ #endif /* defined(__NETIPX_IPX_H) */ +/* Definitions for sys/uio.h */ +#if defined(_SYS_UIO_H) +#define __UAPI_DEF_IOVEC 0 +#else /* defined(_SYS_UIO_H) */ +#define __UAPI_DEF_IOVEC 1 +#endif /* defined(_SYS_UIO_H) */ + /* Definitions for xattr.h */ #if defined(_SYS_XATTR_H) #define __UAPI_DEF_XATTR 0 @@ -235,6 +242,9 @@ #define __UAPI_DEF_IPX_CONFIG_DATA 1 #define __UAPI_DEF_IPX_ROUTE_DEF 1 +/* Definitions for uio.h */ +#define __UAPI_DEF_IOVEC 1 + /* Definitions for xattr.h */ #define __UAPI_DEF_XATTR 1 diff --git a/include/uapi/linux/uio.h b/include/uapi/linux/uio.h index 2731d56..cba4819 100644 --- a/include/uapi/linux/uio.h +++ b/include/uapi/linux/uio.h @@ -9,15 +9,17 @@ #ifndef _UAPI__LINUX_UIO_H #define _UAPI__LINUX_UIO_H +#include #include #include - +#if __UAPI_DEF_IOVEC struct iovec { void __user *iov_base; /* BSD uses caddr_t (1003.1g requires void *) */ __kernel_size_t iov_len; /* Must be size_t (1003.1g) */ }; +#endif /* __UAPI_DEF_IOVEC */ /* * UIO_MAXIOV shall be at least 16 1003.1g (5.4.1.1) -- 2.8.1