summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2020-02-05 12:55:01 -0500
committerAdam Jackson <ajax@redhat.com>2020-02-05 12:59:48 -0500
commit52c421c650f8813665b31890df691b31fabc366a (patch)
tree7e765006c7d10f4def89c828abcc67c3325dd763
parent922ec516beaae0c0735bbd46d470908f243e3605 (diff)
qxl: Include only the dpms headers we need
dpms.h is provided by libXext, but nothing in our configure.ac is verifying that we have libXext's headers. Fortunately we only need the definitions in dpmsconst.h (which dpms.h included for us), which is in xorgproto and thus implied by having an xserver DDK to build against. And we're even trying to include dpmsconst.h when we think we have it, meaning when HAVE_XEXTPROTO_71 is defined, but while many other drivers define that macro in their configure.ac, we for no particularly good reason do not. Oops. But since xextproto is about ten years old by now we can probably just safely include it unconditionally.
-rw-r--r--src/qxl_drmmode.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/qxl_drmmode.c b/src/qxl_drmmode.c
index 8ebc708..337bbd7 100644
--- a/src/qxl_drmmode.c
+++ b/src/qxl_drmmode.c
@@ -36,13 +36,7 @@
#include "qxl_drmmode.h"
#include "X11/Xatom.h"
#include "xf86DDC.h"
-/* DPMS */
-#ifdef HAVE_XEXTPROTO_71
#include <X11/extensions/dpmsconst.h>
-#else
-#define DPMS_SERVER
-#include <X11/extensions/dpms.h>
-#endif
#include <cursorstr.h>
#include "qxl.h"