From patchwork Fri Sep 14 04:36:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maya Rashish X-Patchwork-Id: 10600975 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3827313AD for ; Fri, 14 Sep 2018 15:45:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1ADC82BAC6 for ; Fri, 14 Sep 2018 15:45:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0CF7D2BAE9; Fri, 14 Sep 2018 15:45:14 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 E8C072BAC6 for ; Fri, 14 Sep 2018 15:45:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0D11C6E916; Fri, 14 Sep 2018 15:45:11 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org X-Greylist: delayed 577 seconds by postgrey-1.36 at gabe; Fri, 14 Sep 2018 04:46:49 UTC Received: from mx.sdf.org (mx.sdf.org [205.166.94.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 73C7D6E008 for ; Fri, 14 Sep 2018 04:46:49 +0000 (UTC) Received: from sdf.org (IDENT:coypu@sdf.lonestar.org [205.166.94.16]) by mx.sdf.org (8.15.2/8.14.5) with ESMTPS id w8E4abvk013445 (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256 bits) verified NO) for ; Fri, 14 Sep 2018 04:36:37 GMT Received: (from coypu@localhost) by sdf.org (8.15.2/8.12.8/Submit) id w8E4abXQ004547 for intel-gfx@lists.freedesktop.org; Fri, 14 Sep 2018 04:36:37 GMT Date: Fri, 14 Sep 2018 04:36:37 +0000 From: Maya Rashish To: intel-gfx@lists.freedesktop.org Message-ID: <20180914043637.GA393@SDF.ORG> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.1 (2017-09-22) X-Mailman-Approved-At: Fri, 14 Sep 2018 15:45:09 +0000 Subject: [Intel-gfx] [PATCH 1/1] include xorg-server.h first for _XSERVER64 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Avoids error with defining conflicting types. --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index ee588815..fc76e955 100644 --- a/configure.ac +++ b/configure.ac @@ -495,10 +495,10 @@ if test "x$_EXT_CHECK" != "xno" -a "x$DRI" != "xno" -a "x$DRI1" != "xno" -a "x$U CFLAGS="$CFLAGS $XORG_CFLAGS $DRI1_CFLAGS $DRM_CFLAGS" CPPFLAGS="$CPPFLAGS $XORG_CFLAGS $DRI1_CFLAGS $DRM_CFLAGS" AC_CHECK_HEADERS([dri.h sarea.h dristruct.h], [], [have_dri1=no], - [/* for dri.h */ - #include - /* for dristruct.h */ + [/* for dristruct.h */ #include + /* for dri.h */ + #include #ifdef HAVE_DRI_H # include #endif