Skip to content

Update file qxl_drmmode.h // fix compile error with DRM enabled.

Ladar requested to merge Levison/xf86-video-qxl:fix-qxl-drmmode-header into master

On my RHEL v9 system, the project fails to compile when KMS/DRM is anabled. It generates an error which looks like:

  CC       qxl_drmmode.lo
In file included from /usr/include/xf86drmMode.h:45,
                 from qxl_drmmode.h:33,
                 from qxl_drmmode.c:36:
/usr/include/xorg/xf86Opt.h:44:10: error: two or more data types in declaration specifiers
   44 |     Bool bool;
      |          ^~~~
In file included from /usr/include/xorg/xf86str.h:43,
                 from qxl_drmmode.h:34,
                 from qxl_drmmode.c:36:
/usr/include/xorg/xf86Opt.h:44:14: warning: declaration does not declare anything
   44 |     Bool bool;
      |              ^
make[3]: *** [Makefile:798: qxl_drmmode.lo] Error 1

Rearranging the xf86Drm include statements in qrm_drmmode.h fixes the problem. This merge should do exactly that.

Merge request reports