[Bug 109587] "xf86drm: Add drmIsMaster()" commit breaks X server builds

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=109587

            Bug ID: 109587
           Summary: "xf86drm: Add drmIsMaster()" commit breaks X server
                    builds
           Product: DRI
           Version: XOrg git
          Hardware: All
                OS: All
            Status: NEW
          Severity: major
          Priority: medium
         Component: libdrm
          Assignee: dri-devel at lists.freedesktop.org
          Reporter: eero.t.tamminen at intel.com

Following commit:
-----------------------------------------------
commit 17dfe3ac93217b43f93bc81d1129bd38a89d0368
Author:     Christopher James Halse Rogers
<christopher.halse.rogers at canonical.com>
AuthorDate: Wed Jan 23 15:38:45 2019 +1100
Commit:     Emil Velikov <emil.l.velikov at gmail.com>
CommitDate: Thu Feb 7 17:43:01 2019 +0000

    xf86drm: Add drmIsMaster()
...
--- a/xf86drm.h
+++ b/xf86drm.h
@@ -37,6 +37,7 @@
 #include <stdarg.h>
 #include <sys/types.h>
 #include <stdint.h>
+#include <stdbool.h>
-----------------------------------------------

Breaks X server build:
-----------------------------------------------
FAILED: hw/xfree86/dri2/xorg_dri2 at sta/dri2.c.o
...
In file included from /path/to/include/xf86drm.h:40:0,
                 from /path/to/hw/xfree86/dri2/dri2.c:39:
/path/to/hw/xfree86/common/xf86Opt.h:44:10: error: two or more data types in
declaration specifiers
     Bool bool;
          ^
In file included from /path/to/hw/xfree86/common/xf86str.h:43:0,
                 from /path/to/hw/xfree86/common/xf86.h:44,
                 from /path/to/hw/xfree86/dri2/dri2.c:48:
/path/to/hw/xfree86/common/xf86Opt.h:44:14: warning: declaration does not
declare anything
     Bool bool;
              ^
-----------------------------------------------

Because couple of structures in X source code are using struct members named as
"bool" (added in 2012):
./hw/xfree86/common/xf86Opt.h:    Bool bool;
./hw/xwin/winconfig.h:    Bool bool;

(FYI: Bool is defined as "int" in several X headers.)

Please revert the part adding "stdbool.h" include / "bool" typedef to the
xf86drm.h header used by X server, until somebody renames those badly named
struct members in X server sources.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20190208/29258e9f/attachment.html>