From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dd20012.kasserver.com (dd20012.kasserver.com [85.13.140.57]) by gabe.freedesktop.org (Postfix) with ESMTPS id 24F6E10E043 for ; Sun, 22 Oct 2023 16:00:44 +0000 (UTC) From: Bernd Kuhls To: igt-dev@lists.freedesktop.org Date: Sun, 22 Oct 2023 17:52:25 +0200 Message-Id: <20231022155226.3484622-7-bernd@kuhls.net> In-Reply-To: <20231022155226.3484622-1-bernd@kuhls.net> References: <20231022155226.3484622-1-bernd@kuhls.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH 6/7] benchmarks/gem_exec_tracer.c: Fix musl build List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mhmdanas Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: From: mhmdanas Original patch was added to void-linux: https://github.com/void-linux/void-packages/commit/111918317d06598fe1459dbe139923404f3f4b9d Bug report with request to split the original patch into some functional changes: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/138 Fixes build error: ../benchmarks/gem_exec_tracer.c:274:1: error: conflicting types for ‘ioctl’; have ‘int(int, long unsigned int, ...)’ 274 | ioctl(int fd, unsigned long request, ...) Signed-off-by: Bernd Kuhls --- benchmarks/gem_exec_tracer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/benchmarks/gem_exec_tracer.c b/benchmarks/gem_exec_tracer.c index 7e86473e4..3156dfc23 100644 --- a/benchmarks/gem_exec_tracer.c +++ b/benchmarks/gem_exec_tracer.c @@ -271,7 +271,11 @@ static int is_i915(int fd) } int +#ifdef __GLIBC__ ioctl(int fd, unsigned long request, ...) +#else +ioctl(int fd, int request, ...) +#endif { struct trace *t, **p; va_list args; -- 2.39.2