From patchwork Thu Mar 22 17:11:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Engestrom X-Patchwork-Id: 10301953 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0B132600F6 for ; Thu, 22 Mar 2018 17:13:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F35F728813 for ; Thu, 22 Mar 2018 17:13:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F1EF628882; Thu, 22 Mar 2018 17:13:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E8C3A28813 for ; Thu, 22 Mar 2018 17:12:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9150F6E1C0; Thu, 22 Mar 2018 17:12:01 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailapp01.imgtec.com (mailapp01.imgtec.com [195.59.15.196]) by gabe.freedesktop.org (Postfix) with ESMTP id E8E176E1C0 for ; Thu, 22 Mar 2018 17:11:59 +0000 (UTC) Received: from hhmail02.hh.imgtec.org (unknown [10.100.10.20]) by Forcepoint Email with ESMTPS id C0F41735DF3FF; Thu, 22 Mar 2018 17:11:54 +0000 (GMT) Received: from localhost.localdomain (10.60.4.28) by hhmail02.hh.imgtec.org (10.100.10.21) with Microsoft SMTP Server (TLS) id 14.3.382.0; Thu, 22 Mar 2018 17:11:58 +0000 From: Eric Engestrom To: Subject: [PATCH libdrm] xf86drmMode: merge successive mutually-exclusive #ifs Date: Thu, 22 Mar 2018 17:11:45 +0000 Message-ID: <20180322171145.17742-1-eric.engestrom@imgtec.com> X-Mailer: git-send-email 2.16.2 MIME-Version: 1.0 X-Originating-IP: [10.60.4.28] 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: , Cc: Emil Velikov Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Eric Engestrom Reviewed-by: Frank Binns Reviewed-by: Frank Binns Reviewed-by: Emil Velikov --- xf86drmMode.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xf86drmMode.c b/xf86drmMode.c index e010547602c6f38ba5a0..6111f477ba0ee25c1f05 100644 --- a/xf86drmMode.c +++ b/xf86drmMode.c @@ -829,8 +829,7 @@ int drmCheckModesettingSupported(const char *busid) } #elif defined(__DragonFly__) return 0; -#endif -#ifdef __OpenBSD__ +#elif defined(__OpenBSD__) int fd; struct drm_mode_card_res res; drmModeResPtr r = 0;