summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2017-06-02 09:12:41 -0700
committerAdam Jackson <ajax@redhat.com>2017-06-13 10:29:31 -0400
commit75bf302ed20f4b9794f71f84c1da2b9fcd689356 (patch)
tree250eaa006aea221200cf75ae54abe40e3c2d10e0 /hw
parentf3689f637f5ac0fb6c231a470e65b39aa5e9ba20 (diff)
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>
Diffstat (limited to 'hw')
-rw-r--r--hw/dmx/glxProxy/glxcmds.c1
-rw-r--r--hw/dmx/glxProxy/glxcmdsswap.c1
2 files changed, 0 insertions, 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>