summaryrefslogtreecommitdiff
path: root/hw/dmx
diff options
context:
space:
mode:
authorMichel Dänzer <michel@tungstengraphics.com>2006-09-06 15:20:55 +0200
committerMichel Dänzer <michel@tungstengraphics.com>2006-09-06 15:20:55 +0200
commit8356be492c6b46abdffa08b13836571ed872e16f (patch)
tree05587cb2716482bcd911e4a82d04a89136902289 /hw/dmx
parentf6ce0839ba5b73247097826d28f7388fe248ec0c (diff)
Make sure _XSERVER64 is defined when it should be and gets tested.
Diffstat (limited to 'hw/dmx')
-rw-r--r--hw/dmx/Makefile.am1
-rw-r--r--hw/dmx/dmx.h4
2 files changed, 5 insertions, 0 deletions
diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index 81b62f1fe..d36647b54 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -83,6 +83,7 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \
Xdmx_CFLAGS = \
-DHAVE_DMX_CONFIG_H \
+ $(DIX_CFLAGS) \
$(GLX_INCS) \
$(GLX_DEFS) \
@DMXMODULES_CFLAGS@
diff --git a/hw/dmx/dmx.h b/hw/dmx/dmx.h
index 18e75de90..becb2da38 100644
--- a/hw/dmx/dmx.h
+++ b/hw/dmx/dmx.h
@@ -51,6 +51,10 @@
#ifndef DMX_H
#define DMX_H
+#if HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
#include "gcstruct.h"
/* Handle client-side include files in one place. */