summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-09-15 11:39:09 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-09-16 11:44:08 +1000
commit159e03204093991ccd4133133c50c0cae88c828f (patch)
treea844b0c33d73fe77e8879627b7d6efe9e377cdf3
parentf56cbe1ef24415d0142b9a7d0ab0a031069ccb52 (diff)
dmx: don't include panoramiXsrv.h if building w/o Xinerama
Reported-by: Marvin Schmidt Tested-by: Marvin Schmidt Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--hw/dmx/dmxgcops.c2
-rw-r--r--hw/dmx/dmxinit.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/hw/dmx/dmxgcops.c b/hw/dmx/dmxgcops.c
index eaabf16dd..267a306db 100644
--- a/hw/dmx/dmxgcops.c
+++ b/hw/dmx/dmxgcops.c
@@ -50,7 +50,9 @@
#include "pixmapstr.h"
#include "dixfontstr.h"
+#ifdef PANORAMIX
#include "panoramiXsrv.h"
+#endif
#define DMX_GCOPS_SET_DRAWABLE(_pDraw, _draw) \
do { \
diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c
index 6a0c259ec..e5598e331 100644
--- a/hw/dmx/dmxinit.c
+++ b/hw/dmx/dmxinit.c
@@ -59,7 +59,9 @@
#include <X11/Xos.h> /* For gettimeofday */
#include "dixstruct.h"
+#ifdef PANORAMIX
#include "panoramiXsrv.h"
+#endif
#include <signal.h> /* For SIGQUIT */