[PATCH xserver] dmx: Remove includes of glxtokens.h
Eric Anholt
eric at anholt.net
Fri Jun 2 16:12:41 UTC 2017
Our top-level glx.h include already provides all of the tokens we use,
and fixes redefinition warnings in the meson build.
Signed-off-by: Eric Anholt <eric at anholt.net>
---
hw/dmx/glxProxy/glxcmds.c | 1 -
hw/dmx/glxProxy/glxcmdsswap.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/hw/dmx/glxProxy/glxcmds.c b/hw/dmx/glxProxy/glxcmds.c
index a77d556dbbda..330d5c4adb51 100644
--- a/hw/dmx/glxProxy/glxcmds.c
+++ b/hw/dmx/glxProxy/glxcmds.c
@@ -39,7 +39,6 @@
#include "dmxsync.h"
#include "glxserver.h"
-#include <GL/glxtokens.h>
#include "g_disptab.h"
#include <pixmapstr.h>
#include <windowstr.h>
diff --git a/hw/dmx/glxProxy/glxcmdsswap.c b/hw/dmx/glxProxy/glxcmdsswap.c
index 5b1722d573c2..92ca512a724b 100644
--- a/hw/dmx/glxProxy/glxcmdsswap.c
+++ b/hw/dmx/glxProxy/glxcmdsswap.c
@@ -30,7 +30,6 @@
#include "glxserver.h"
#include "glxutil.h"
-#include <GL/glxtokens.h>
#include <g_disptab.h>
#include <pixmapstr.h>
#include <windowstr.h>
--
2.11.0
More information about the xorg-devel
mailing list