From patchwork Mon Jun 18 15:15:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 138993 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp4074391lji; Mon, 18 Jun 2018 08:16:29 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKdi0DBunrwvOzhD3bAEvi+M2+dOLGPQxfQRYzB/kdLWns+hdcWPcwCAqZVT/CXUGznG6BV X-Received: by 2002:a65:5cc8:: with SMTP id b8-v6mr11408202pgt.85.1529334989130; Mon, 18 Jun 2018 08:16:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529334989; cv=none; d=google.com; s=arc-20160816; b=Y+4RTaVugD2Fc4QdpV6AsVrSH84fw/ajp5XsbbZD44wYT8YtjWN93UfSlJhpNOnXIo RwI9gjvzgtHoIxZ4qa8nKIocg7XdayvXprAg3OHa8xEwNYvehC3kQg6+megjm2c2e94X rjUe4N/ktR+xOGrdVRj+rGR7uN4XGknmt/KvRD3w7n3lJ4J7Ey/QqCmr6x5cOkMVUngr DKiRR1OLbm2lr3oxzR+t16bv62Z5oUSQ1gPauYFUDmQwTPw/9Q8yLQMQwpxQEsIbfayR wTk6A0DgBALf8nQFydxWnAj0mOGU9YjSHlBxMsLRqxvqPh/panApBhZGjqw6M85Uwc5F +0pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:message-id:date:subject:to:from:delivered-to :arc-authentication-results; bh=1Yv02f3m/HBUt+JWhkVKCS3AHza9oWfkOUU2Lcf9BNg=; b=RM53cCiaUrXY9VG+PCk7pGTDcP8W0Ju6GHPOrPZb0S8JERmSn4yOTAA6lXcPSgke2V 9xgmRBre0LCq2lTWugnBIYgo9owgmUThNw7YIaExuxKrkhk3/H9rycLm4/oIYNcaTBA4 mfemkPVA+KjLW39YexoZwZDInFSyNB9E7S6o2QP+ihBodd/T2txiNNTBVdE0MFZke1vc 0Df2dy0sH7iQLTOOyCI8x4YIjvrcN0NOkfLu5PuwsZvXDX0SMogNmNYwR+LqiHNyq9ds Qj9jph8gMjVy8J6ysgsmcQgT5FHl/qmeonSO7luduLMucNG5tHYam2FQm2HwYqEFIxp3 SAtA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id w11-v6si8654840pge.422.2018.06.18.08.16.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Jun 2018 08:16:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CA8796E466; Mon, 18 Jun 2018 15:15:57 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr0-x233.google.com (mail-wr0-x233.google.com [IPv6:2a00:1450:400c:c0c::233]) by gabe.freedesktop.org (Postfix) with ESMTPS id D2C3E6E466 for ; Mon, 18 Jun 2018 15:15:55 +0000 (UTC) Received: by mail-wr0-x233.google.com with SMTP id w7-v6so17247875wrn.6 for ; Mon, 18 Jun 2018 08:15:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=n/eMi319A9XZ6UQey/gqnWjU9Qheq09C9nA0dDKZxSo=; b=JGHH9IWGF1buVQNKT07QUfx1NcsyAwoaT7dxTvgsg22eecjztaIyz475YZayDttcDN O9rtMAHiGTdCi1MiJlUp+dBr+t39S8h4w5QmpHT+AHAPXlSgP653AkSnoFDL4FrgbFAG IxS9X1ieYjPkHPU0t56Wt5TD2fktGOYWsVsQgTvG1Afm5L2S75/VQcrvzLxpu4DHXAD+ Qt45XJ5kw8dy8qxMYcrTk26eceAMYPCNgshfzEcLJTHzNpBO1oBmpBtALoTjffzl4vN8 2hdRkf3bV2y+V8WIpyPVReKMAYSDlabxrhSvPD729JdA8O1xNlOCsuynzudvB96bRpVF Z+qw== X-Gm-Message-State: APt69E0bggWHjq557Oh2v0J/dNUglmFQVRpcjxcCGotH9osVyLsNWcFe uy6fLrwc2NVzPjem43FbNlRiYEtQ X-Received: by 2002:adf:93c6:: with SMTP id 64-v6mr10669388wrp.119.1529334954203; Mon, 18 Jun 2018 08:15:54 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id p196-v6sm11713085wmb.20.2018.06.18.08.15.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jun 2018 08:15:53 -0700 (PDT) From: Ross Burton To: dri-devel@lists.freedesktop.org Subject: [PATCH] tests/nouveau/threaded: adapt ioctl signature Date: Mon, 18 Jun 2018 16:15:49 +0100 Message-Id: <20180618151549.1480-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" POSIX says ioctl() has the signature (int, int, ...) but glibc has decided to use (int, unsigned long int, ...) instead. Use a #ifdef to adapt the replacement function as appropriate. --- tests/nouveau/threaded.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/nouveau/threaded.c b/tests/nouveau/threaded.c index 3669bcd3..e1c27c01 100644 --- a/tests/nouveau/threaded.c +++ b/tests/nouveau/threaded.c @@ -36,7 +36,11 @@ static int failed; static int import_fd; +#ifdef __GLIBC__ int ioctl(int fd, unsigned long request, ...) +#else +int ioctl(int fd, int request, ...) +#endif { va_list va; int ret;