From 75bf302ed20f4b9794f71f84c1da2b9fcd689356 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Fri, 2 Jun 2017 09:12:41 -0700
Subject: [PATCH] dmx: Remove includes of glxtokens.h

Our top-level glx.h include already provides all of the tokens we use,
and fixes redefinition warnings in the meson build.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@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 a77d556db..330d5c4ad 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 5b1722d57..92ca512a7 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>