summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <Alan.Coopersmith@sun.com>2005-09-20 16:53:34 +0000
committerAlan Coopersmith <Alan.Coopersmith@sun.com>2005-09-20 16:53:34 +0000
commit65b5f0017e29903565aff0b7527d955ed016c9a6 (patch)
tree96a00e7bc4ebeb20399a2436c9140b3fe837e209
parent0b7441b19a1a5df91aca6b1a02944afb636bc523 (diff)
Only include radeon_dri.h & radeon_sarea.h if XF86DRI is defined.
Include "compiler.h" to define __inline__ on non-gcc compilers
-rw-r--r--src/radeon.h1
-rw-r--r--src/radeon_exa.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/src/radeon.h b/src/radeon.h
index 46ea6948..c820d9e6 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -39,6 +39,7 @@
#define _RADEON_H_
#include "xf86str.h"
+#include "compiler.h"
/* PCI support */
#include "xf86Pci.h"
diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index 10949cf2..e5a9f210 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -35,11 +35,15 @@
#include "radeon.h"
#include "radeon_reg.h"
+#ifdef XF86DRI
#include "radeon_dri.h"
+#endif
#include "radeon_macros.h"
#include "radeon_probe.h"
#include "radeon_version.h"
+#ifdef XF86DRI
#include "radeon_sarea.h"
+#endif
#include "xf86.h"